From 3b8cd0beabf3e5de40d24c8924e852df3609d817 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Mon, 3 Dec 2018 01:16:54 +0200
Subject: [PATCH] Issue #3017555: Changed [Varbase] Components dependencies on
 install: enable or dependencies: enable of modules in the .info.yml and
 composer.json to have tilde Version Range (~)

---
 composer.json                                 |  32 +-
 config/install/automated_cron.settings.yml    |   1 -
 config/install/block_content.type.basic.yml   |   7 -
 config/install/config_ignore.settings.yml     |   4 -
 ...d_override.block_content.basic.changed.yml |  17 -
 ...ield_override.block_content.basic.info.yml |  17 -
 ...rm_display.block_content.basic.default.yml |  36 --
 ....entity_form_display.user.user.default.yml |  34 --
 ...ew_display.block_content.basic.default.yml |  21 -
 ....entity_view_display.user.user.compact.yml |  25 --
 ....entity_view_display.user.user.default.yml |  24 --
 .../core.entity_view_mode.block.token.yml     |   9 -
 ...e.entity_view_mode.block_content.token.yml |   9 -
 .../core.entity_view_mode.user.token.yml      |   9 -
 config/install/ds.settings.yml                |   8 -
 config/install/ds_extras.settings.yml         |   9 -
 .../field.field.block_content.basic.body.yml  |  21 -
 ...torage.block_content.field_description.yml |  23 --
 ...ield.storage.block_content.field_image.yml |  19 -
 ...eld.storage.block_content.field_images.yml |  20 -
 .../field.storage.node.field_categories.yml   |  19 -
 .../field.storage.node.field_description.yml  |  23 --
 .../field.storage.node.field_image.yml        |  19 -
 .../field.storage.node.field_images.yml       |  19 -
 .../install/field.storage.node.field_tags.yml |  19 -
 .../field.storage.node.field_video.yml        |  19 -
 ...torage.taxonomy_term.field_description.yml |  23 --
 ...ield.storage.taxonomy_term.field_image.yml |  19 -
 ...on.destination.user_have_total_control.yml |  17 -
 config/install/login_destination.settings.yml |   2 -
 config/install/pathologic.settings.yml        |   7 -
 config/install/views.view.archive.yml         | 240 ------------
 config/install/views.view.frontpage.yml       | 361 ------------------
 config/install/views.view.taxonomy_term.yml   | 334 ----------------
 .../features.bundle.varbase.yml               |   0
 configbit/default.components.varbase.bit.yml  |   8 +-
 .../features/varbase/varbase-reports.feature  |   9 -
 varbase.info.yml                              | 116 +-----
 varbase.install                               |  90 +----
 39 files changed, 41 insertions(+), 1648 deletions(-)
 delete mode 100644 config/install/automated_cron.settings.yml
 delete mode 100644 config/install/block_content.type.basic.yml
 delete mode 100644 config/install/config_ignore.settings.yml
 delete mode 100644 config/install/core.base_field_override.block_content.basic.changed.yml
 delete mode 100644 config/install/core.base_field_override.block_content.basic.info.yml
 delete mode 100644 config/install/core.entity_form_display.block_content.basic.default.yml
 delete mode 100644 config/install/core.entity_form_display.user.user.default.yml
 delete mode 100644 config/install/core.entity_view_display.block_content.basic.default.yml
 delete mode 100644 config/install/core.entity_view_display.user.user.compact.yml
 delete mode 100644 config/install/core.entity_view_display.user.user.default.yml
 delete mode 100644 config/install/core.entity_view_mode.block.token.yml
 delete mode 100644 config/install/core.entity_view_mode.block_content.token.yml
 delete mode 100644 config/install/core.entity_view_mode.user.token.yml
 delete mode 100644 config/install/ds.settings.yml
 delete mode 100644 config/install/ds_extras.settings.yml
 delete mode 100644 config/install/field.field.block_content.basic.body.yml
 delete mode 100644 config/install/field.storage.block_content.field_description.yml
 delete mode 100644 config/install/field.storage.block_content.field_image.yml
 delete mode 100644 config/install/field.storage.block_content.field_images.yml
 delete mode 100644 config/install/field.storage.node.field_categories.yml
 delete mode 100644 config/install/field.storage.node.field_description.yml
 delete mode 100644 config/install/field.storage.node.field_image.yml
 delete mode 100644 config/install/field.storage.node.field_images.yml
 delete mode 100644 config/install/field.storage.node.field_tags.yml
 delete mode 100644 config/install/field.storage.node.field_video.yml
 delete mode 100644 config/install/field.storage.taxonomy_term.field_description.yml
 delete mode 100644 config/install/field.storage.taxonomy_term.field_image.yml
 delete mode 100644 config/install/login_destination.destination.user_have_total_control.yml
 delete mode 100644 config/install/login_destination.settings.yml
 delete mode 100644 config/install/pathologic.settings.yml
 delete mode 100644 config/install/views.view.archive.yml
 delete mode 100644 config/install/views.view.frontpage.yml
 delete mode 100644 config/install/views.view.taxonomy_term.yml
 rename config/{install => optional}/features.bundle.varbase.yml (100%)
 delete mode 100644 tests/features/varbase/varbase-reports.feature

diff --git a/composer.json b/composer.json
index 4b0a61ef..8e79f77b 100644
--- a/composer.json
+++ b/composer.json
@@ -27,10 +27,10 @@
     }
   },
   "require": {
-    "composer/installers": "^1.5.0",
-    "oomphinc/composer-installers-extender": "^1.1.2",
-    "cweagans/composer-patches": "^1.6.4",
-    "drupal-composer/drupal-scaffold": "^2.4.0",
+    "composer/installers": "~1",
+    "oomphinc/composer-installers-extender": "~1",
+    "cweagans/composer-patches": "~1",
+    "drupal-composer/drupal-scaffold": "~2",
     "drupal/drupal-library-installer-plugin": "^0.3",
     "drupal/varbase_core": "6.x-dev",
     "drupal/varbase_media": "6.x-dev",
@@ -63,17 +63,17 @@
     "drupal/betterlogin": "1.x-dev#f7cf1c5c9ec5e80c6ac0ef04ed605e25495232cd"
   },
   "require-dev": {
-    "drush/drush": "^8.1.16",
-    "drupal/coder": "^8.2.12",
-    "drupal/drupal-extension": "^3.4.1",
-    "phing/phing": "^2.16.1",
-    "behat/behat": "^3.4.3",
-    "behat/mink": "^1.7.1",
-    "behat/mink-extension": "^2.3.1",
-    "behat/mink-goutte-driver": "^1.2.1",
-    "behat/mink-zombie-driver": "^1.4.0",
-    "behat/mink-selenium2-driver": "^1.3.1",
-    "behatch/contexts": "^3.1.0",
+    "drush/drush": "~9",
+    "drupal/coder": "~8",
+    "drupal/drupal-extension": "~3",
+    "phing/phing": "~2",
+    "behat/behat": "~3",
+    "behat/mink": "~1",
+    "behat/mink-extension": "~2.",
+    "behat/mink-goutte-driver": "~1",
+    "behat/mink-zombie-driver": "~1",
+    "behat/mink-selenium2-driver": "~1",
+    "behatch/contexts": "~3",
     "emuse/behat-html-formatter": "^0.1.0"
   },
   "config": {
@@ -115,7 +115,7 @@
       "npm-asset"
     ],
     "installer-paths": {
-      "docroot/core": ["drupal/core"],
+      "docroot/core": ["type:drupal-core"],
       "docroot/profiles/{$name}": ["type:drupal-profile"],
       "docroot/modules/contrib/{$name}": ["type:drupal-module"],
       "docroot/themes/contrib/{$name}": ["type:drupal-theme"],
diff --git a/config/install/automated_cron.settings.yml b/config/install/automated_cron.settings.yml
deleted file mode 100644
index 963bd71b..00000000
--- a/config/install/automated_cron.settings.yml
+++ /dev/null
@@ -1 +0,0 @@
-interval: 10800
diff --git a/config/install/block_content.type.basic.yml b/config/install/block_content.type.basic.yml
deleted file mode 100644
index ee04d7ef..00000000
--- a/config/install/block_content.type.basic.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: basic
-label: 'Basic block'
-revision: 1
-description: 'A basic block contains a title and a body.'
diff --git a/config/install/config_ignore.settings.yml b/config/install/config_ignore.settings.yml
deleted file mode 100644
index 3d91b827..00000000
--- a/config/install/config_ignore.settings.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-ignored_config_entities:
- - 'webform.webform.*'
- - 'xmlsitemap.xmlsitemap.*'
- - 'varbase_core.general_settings.*'
\ No newline at end of file
diff --git a/config/install/core.base_field_override.block_content.basic.changed.yml b/config/install/core.base_field_override.block_content.basic.changed.yml
deleted file mode 100644
index f3e225cf..00000000
--- a/config/install/core.base_field_override.block_content.basic.changed.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-id: block_content.basic.changed
-field_name: changed
-entity_type: block_content
-bundle: basic
-label: Changed
-description: 'The time that the custom block was last edited.'
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: changed
diff --git a/config/install/core.base_field_override.block_content.basic.info.yml b/config/install/core.base_field_override.block_content.basic.info.yml
deleted file mode 100644
index 55f0d3d1..00000000
--- a/config/install/core.base_field_override.block_content.basic.info.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-id: block_content.basic.info
-field_name: info
-entity_type: block_content
-bundle: basic
-label: 'Block description'
-description: 'A brief description of your block.'
-required: true
-translatable: true
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-field_type: string
diff --git a/config/install/core.entity_form_display.block_content.basic.default.yml b/config/install/core.entity_form_display.block_content.basic.default.yml
deleted file mode 100644
index 753e1247..00000000
--- a/config/install/core.entity_form_display.block_content.basic.default.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-    - field.field.block_content.basic.body
-  module:
-    - text
-id: block_content.basic.default
-targetEntityType: block_content
-bundle: basic
-mode: default
-content:
-  body:
-    type: text_textarea_with_summary
-    weight: -4
-    settings:
-      rows: 9
-      summary_rows: 3
-      placeholder: ''
-    third_party_settings: {  }
-  info:
-    type: string_textfield
-    weight: -5
-    settings:
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  langcode:
-    type: language_select
-    weight: 2
-    settings: {  }
-    third_party_settings: {  }
-  translation:
-    weight: 10
-hidden: {  }
diff --git a/config/install/core.entity_form_display.user.user.default.yml b/config/install/core.entity_form_display.user.user.default.yml
deleted file mode 100644
index 02f5bf54..00000000
--- a/config/install/core.entity_form_display.user.user.default.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-id: user.user.default
-targetEntityType: user
-bundle: user
-mode: default
-content:
-  account:
-    weight: -10
-  contact:
-    weight: 5
-  google_analytics:
-    weight: 3
-  language:
-    weight: 0
-  path:
-    type: path
-    weight: 30
-    settings: {  }
-    third_party_settings: {  }
-  timezone:
-    weight: 6
-  user_picture:
-    type: image_image
-    settings:
-      progress_indicator: throbber
-      preview_image_style: thumbnail
-    third_party_settings: {  }
-    weight: -1
-hidden:
-  langcode: true
diff --git a/config/install/core.entity_view_display.block_content.basic.default.yml b/config/install/core.entity_view_display.block_content.basic.default.yml
deleted file mode 100644
index 7a76473c..00000000
--- a/config/install/core.entity_view_display.block_content.basic.default.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-    - field.field.block_content.basic.body
-  module:
-    - text
-id: block_content.basic.default
-targetEntityType: block_content
-bundle: basic
-mode: default
-content:
-  body:
-    label: hidden
-    type: text_default
-    weight: 0
-    settings: {  }
-    third_party_settings: {  }
-hidden:
-  langcode: true
diff --git a/config/install/core.entity_view_display.user.user.compact.yml b/config/install/core.entity_view_display.user.user.compact.yml
deleted file mode 100644
index 69334439..00000000
--- a/config/install/core.entity_view_display.user.user.compact.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.user.compact
-  module:
-    - user
-id: user.user.compact
-targetEntityType: user
-bundle: user
-mode: compact
-content:
-  masquerade:
-    weight: 50
-  user_picture:
-    type: image
-    weight: 0
-    settings:
-      image_style: thumbnail
-      image_link: content
-    third_party_settings: {  }
-    label: hidden
-hidden:
-  langcode: true
-  member_for: true
diff --git a/config/install/core.entity_view_display.user.user.default.yml b/config/install/core.entity_view_display.user.user.default.yml
deleted file mode 100644
index 090671a4..00000000
--- a/config/install/core.entity_view_display.user.user.default.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-id: user.user.default
-targetEntityType: user
-bundle: user
-mode: default
-content:
-  masquerade:
-    weight: 50
-  member_for:
-    weight: 5
-  user_picture:
-    type: image
-    weight: 0
-    settings:
-      image_style: thumbnail
-      image_link: content
-    third_party_settings: {  }
-    label: hidden
-hidden:
-  langcode: true
diff --git a/config/install/core.entity_view_mode.block.token.yml b/config/install/core.entity_view_mode.block.token.yml
deleted file mode 100644
index 02287c29..00000000
--- a/config/install/core.entity_view_mode.block.token.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - block
-id: block.token
-label: Token
-targetEntityType: block
-cache: true
diff --git a/config/install/core.entity_view_mode.block_content.token.yml b/config/install/core.entity_view_mode.block_content.token.yml
deleted file mode 100644
index 07bdd92b..00000000
--- a/config/install/core.entity_view_mode.block_content.token.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - block_content
-id: block_content.token
-label: Token
-targetEntityType: block_content
-cache: true
diff --git a/config/install/core.entity_view_mode.user.token.yml b/config/install/core.entity_view_mode.user.token.yml
deleted file mode 100644
index b1e4a140..00000000
--- a/config/install/core.entity_view_mode.user.token.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - user
-id: user.token
-label: Token
-targetEntityType: user
-cache: true
diff --git a/config/install/ds.settings.yml b/config/install/ds.settings.yml
deleted file mode 100644
index eb40b776..00000000
--- a/config/install/ds.settings.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-disabled: false
-field_template: true
-ft-default: default
-ft-show-colon: false
-classes:
-  region: {  }
-  field: {  }
-use_field_names: true
diff --git a/config/install/ds_extras.settings.yml b/config/install/ds_extras.settings.yml
deleted file mode 100644
index 2ac05cbc..00000000
--- a/config/install/ds_extras.settings.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-fields_extra: false
-fields_extra_list: {  }
-field_permissions: false
-hidden_region: false
-override_node_revision: false
-override_node_revision_view_mode: full
-region_to_block: false
-region_blocks: {  }
-switch_field: false
diff --git a/config/install/field.field.block_content.basic.body.yml b/config/install/field.field.block_content.basic.body.yml
deleted file mode 100644
index 89118eff..00000000
--- a/config/install/field.field.block_content.basic.body.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - block_content.type.basic
-    - field.storage.block_content.body
-  module:
-    - text
-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/config/install/field.storage.block_content.field_description.yml b/config/install/field.storage.block_content.field_description.yml
deleted file mode 100644
index 6a104eaf..00000000
--- a/config/install/field.storage.block_content.field_description.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - block_content
-id: block_content.field_description
-field_name: field_description
-entity_type: block_content
-label: 'Description'
-required: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.block_content.field_image.yml b/config/install/field.storage.block_content.field_image.yml
deleted file mode 100644
index b7967a3b..00000000
--- a/config/install/field.storage.block_content.field_image.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - block_content
-    - media
-id: block_content.field_image
-field_name: field_image
-entity_type: block_content
-type: entity_reference
-settings:
-  target_type: media
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.block_content.field_images.yml b/config/install/field.storage.block_content.field_images.yml
deleted file mode 100644
index 7beaa9a8..00000000
--- a/config/install/field.storage.block_content.field_images.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-uuid: 1ea51360-d906-4a6e-a21e-37c5475fe270
-langcode: en
-status: true
-dependencies:
-  module:
-    - block_content
-    - media
-id: block_content.field_images
-field_name: field_images
-entity_type: block_content
-type: entity_reference
-settings:
-  target_type: media
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_categories.yml b/config/install/field.storage.node.field_categories.yml
deleted file mode 100644
index 27d295c1..00000000
--- a/config/install/field.storage.node.field_categories.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - taxonomy
-id: node.field_categories
-field_name: field_categories
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_description.yml b/config/install/field.storage.node.field_description.yml
deleted file mode 100644
index 886c90f5..00000000
--- a/config/install/field.storage.node.field_description.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-id: node.field_description
-field_name: field_description
-entity_type: node
-label: 'Description'
-required: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_image.yml b/config/install/field.storage.node.field_image.yml
deleted file mode 100644
index fb7da736..00000000
--- a/config/install/field.storage.node.field_image.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - node
-id: node.field_image
-field_name: field_image
-entity_type: node
-type: entity_reference
-settings:
-  target_type: media
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_images.yml b/config/install/field.storage.node.field_images.yml
deleted file mode 100644
index 8977e7f5..00000000
--- a/config/install/field.storage.node.field_images.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - node
-id: node.field_images
-field_name: field_images
-entity_type: node
-type: entity_reference
-settings:
-  target_type: media
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_tags.yml b/config/install/field.storage.node.field_tags.yml
deleted file mode 100644
index 73f821f2..00000000
--- a/config/install/field.storage.node.field_tags.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - node
-    - taxonomy
-id: node.field_tags
-field_name: field_tags
-entity_type: node
-type: entity_reference
-settings:
-  target_type: taxonomy_term
-module: core
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.node.field_video.yml b/config/install/field.storage.node.field_video.yml
deleted file mode 100644
index 564676f1..00000000
--- a/config/install/field.storage.node.field_video.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - node
-id: node.field_video
-field_name: field_video
-entity_type: node
-type: entity_reference
-settings:
-  target_type: media
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.taxonomy_term.field_description.yml b/config/install/field.storage.taxonomy_term.field_description.yml
deleted file mode 100644
index 7f315b32..00000000
--- a/config/install/field.storage.taxonomy_term.field_description.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - taxonomy
-id: taxonomy_term.field_description
-field_name: field_description
-entity_type: taxonomy_term
-label: 'Description'
-required: false
-default_value: {  }
-default_value_callback: ''
-settings: {  }
-type: string_long
-settings:
-  case_sensitive: false
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/field.storage.taxonomy_term.field_image.yml b/config/install/field.storage.taxonomy_term.field_image.yml
deleted file mode 100644
index b36afa45..00000000
--- a/config/install/field.storage.taxonomy_term.field_image.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  module:
-    - media
-    - taxonomy
-id: taxonomy_term.field_image
-field_name: field_image
-entity_type: taxonomy_term
-type: entity_reference
-settings:
-  target_type: media
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
diff --git a/config/install/login_destination.destination.user_have_total_control.yml b/config/install/login_destination.destination.user_have_total_control.yml
deleted file mode 100644
index 78c5e954..00000000
--- a/config/install/login_destination.destination.user_have_total_control.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-name: user_have_total_control
-label: 'User have total control'
-triggers:
-  login: login
-destination_path: 'internal:/admin/dashboard'
-pages_type: 0
-pages: ''
-roles:
-  editor: editor
-  content_admin: content_admin
-  site_admin: site_admin
-  administrator: administrator
-weight: 0
-enabled: true
diff --git a/config/install/login_destination.settings.yml b/config/install/login_destination.settings.yml
deleted file mode 100644
index fb91fee4..00000000
--- a/config/install/login_destination.settings.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-preserve_destination: false
-immediate_redirect: false
diff --git a/config/install/pathologic.settings.yml b/config/install/pathologic.settings.yml
deleted file mode 100644
index 9d1a1c7b..00000000
--- a/config/install/pathologic.settings.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-scheme_whitelist:
-  - http
-  - https
-  - files
-  - internal
-protocol_style: path
-local_paths: ''
diff --git a/config/install/views.view.archive.yml b/config/install/views.view.archive.yml
deleted file mode 100644
index 65420ad0..00000000
--- a/config/install/views.view.archive.yml
+++ /dev/null
@@ -1,240 +0,0 @@
-langcode: en
-status: false
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-  module:
-    - node
-    - user
-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: true
-          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/config/install/views.view.frontpage.yml b/config/install/views.view.frontpage.yml
deleted file mode 100644
index 22f77969..00000000
--- a/config/install/views.view.frontpage.yml
+++ /dev/null
@@ -1,361 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.rss
-    - core.entity_view_mode.node.teaser
-  module:
-    - node
-    - user
-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:
-        area_text_custom:
-          admin_label: ''
-          content: 'No front page content has been created yet.'
-          empty: true
-          field: area_text_custom
-          group_type: group
-          id: area_text_custom
-          label: ''
-          relationship: none
-          table: views
-          tokenize: false
-          plugin_id: text_custom
-        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: ''
-          empty: true
-          title: 'Welcome to [site:name]'
-          label: ''
-          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: 3
-    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: {  }
-  frontpage_block:
-    display_plugin: block
-    id: frontpage_block
-    display_title: Block
-    position: 2
-    display_options:
-      display_extenders: {  }
-      enabled: true
-      title: ''
-      defaults:
-        title: false
-        header: false
-        empty: false
-      allow:
-        items_per_page: true
-        pager: pager
-        sort_fields: sort_fields
-        configure_sorts: configure_sorts
-        offset: '0'
-        hide_fields: '0'
-        disable_filters: '0'
-      block_description: 'Frontpage block'
-      block_category: 'Lists (Views)'
-      header:
-        area:
-          id: area
-          table: views
-          field: area
-          relationship: none
-          group_type: group
-          admin_label: ''
-          empty: true
-          tokenize: true
-          content:
-            value: '<h1>Welcome to [site:name]</h1>'
-            format: code_html
-          plugin_id: text
-      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: "<p>No front page content has been created yet. This page is created through \"Panels\" module.</p>\n<p>You can edit it from \"Manage Content\" at the bottom of the page, or enable \"Page Manager UI\" module to edit it from Administration \\ Structure.</p>"
-          label: ''
-          plugin_id: text_custom
-    cache_metadata:
-      contexts:
-        - 'languages:language_interface'
-        - url.query_args
-        - '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/config/install/views.view.taxonomy_term.yml b/config/install/views.view.taxonomy_term.yml
deleted file mode 100644
index 456c9f11..00000000
--- a/config/install/views.view.taxonomy_term.yml
+++ /dev/null
@@ -1,334 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - core.entity_view_mode.node.teaser
-  module:
-    - node
-    - taxonomy
-    - user
-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: {  }
-      enabled: false
-    cache_metadata:
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      max-age: -1
-      tags: {  }
-  terms_list_block:
-    display_plugin: block
-    id: terms_list_block
-    display_title: 'Terms list'
-    position: 1
-    display_options:
-      display_extenders:
-        metatag_display_extender: {  }
-      query:
-        type: views_query
-        options: {  }
-      enabled: true
-      display_description: ''
-    cache_metadata:
-      contexts:
-        - 'languages:language_interface'
-        - url
-        - url.query_args
-        - 'user.node_grants:view'
-        - user.permissions
-      max-age: -1
-      tags: {  }
diff --git a/config/install/features.bundle.varbase.yml b/config/optional/features.bundle.varbase.yml
similarity index 100%
rename from config/install/features.bundle.varbase.yml
rename to config/optional/features.bundle.varbase.yml
diff --git a/configbit/default.components.varbase.bit.yml b/configbit/default.components.varbase.bit.yml
index 7a3381d3..eeffc187 100644
--- a/configbit/default.components.varbase.bit.yml
+++ b/configbit/default.components.varbase.bit.yml
@@ -13,14 +13,14 @@ config_bit:
         - libraries
         # Enable listed Varbase modules in order at this installation step. 
         - varbase_core
+        - varbase_media
+        - varbase_editor
         - varbase_admin
-        - varbase_total_control
         - varbase_security
         - varbase_seo
-        - varbase_editor
-        - varbase_media
         - varbase_webform
         - varbase_page
         - varbase_landing
-        - varbase_tour
+        - varbase_total_control
         - varbase_default_content
+        - varbase_tour
diff --git a/tests/features/varbase/varbase-reports.feature b/tests/features/varbase/varbase-reports.feature
deleted file mode 100644
index df17d834..00000000
--- a/tests/features/varbase/varbase-reports.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-Feature: Varbase reports
-
-  @VARBASE-956 @OPEN @check @development @staging @production @MANUAL
-  Scenario: Access content report
-    Given I am a logged in user with the "webmaster" user
-    When I go to "/admin/status/reports/varbase"
-    Then I should see "Content report"
-    When I click on "Content report"
-    Then I should see the page title as "Created content report"
diff --git a/varbase.info.yml b/varbase.info.yml
index bb382101..dae4e7f2 100755
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -7,123 +7,17 @@ distribution:
   install:
     theme: vartheme_admin
 version: 8.x-6.x-dev
-dependencies:
-  # core
-  - automated_cron
-  - block
-  - block_content
-  - breakpoint
-  - ckeditor
-  - color
-  - config
-  - contextual
-  - datetime
-  - dynamic_page_cache
-  - big_pipe
-  - editor
-  - filter
-  - entity_reference
-  - field
-  - field_ui
-  - file
-  - help
-  - history
-  - image
-  - media
-  - menu_link_content
-  - menu_ui
-  - node
-  - options
-  - page_cache
-  - path
-  - quickedit
-  - responsive_image
-  - shortcut
-  - syslog
-  - taxonomy
-  - telephone
-  - toolbar
-  - tour
-  - update
-  - views
+install:
+  - system
+  - action
   - user
-  - text
-  - settings_tray
-  - layout_discovery
-
-  # contrib modules
-  - entity
-  - entity_clone
-  - config_update
-  - config_filter
-  - config_ignore
-  - ctools
-  - ctools_block
-  - ctools_views
-  - token
-  - page_manager
-  - page_manager_ui
-  - panels
-  - panels_ipe
-  - bootstrap_layouts
-  - ds
-  - ds_extras
-  - views_bootstrap
-  - field_group
-  - smart_trim
-  - advanced_text_formatter
-  - block_class
-  - menu_block
-  - features
-  - linkit
-  - anchor_link
-  - views_infinite_scroll
-  - entityqueue
-  - entityqueue_form_widget
-  - embed
-  - entity_browser
-  - entity_browser_enhanced
-  - dropzonejs
-  - dropzonejs_eb_widget
-  - entity_embed
-  - inline_entity_form
-  - crop
-  - focal_point
-  - pathologic
-  - persistent_login
-  - captcha
-  - recaptcha
-  - ultimate_cron
-  - content_lock
-  - content_lock_timeout
-  - node_edit_protection
-  - rabbit_hole
-  - rh_node
-  - rh_taxonomy
-  - fast404
-  - imageapi_optimize
-  - mailsystem
-  - smtp
-  - maxlength
-  - menu_position
-  - better_exposed_filters
-  - autocomplete_deluxe
-  - link_attributes
-  - login_destination
-  - betterlogin
-  - ckeditor_media_embed
-
+  - node
+  - block
 themes:
-  # Contrib themes.
   - adminimal_theme
   - bootstrap
-
-  # Custom themes.
   - vartheme
   - vartheme_admin
-distribution:
-  name: Varbase
-features: true
 
 interface translation project: varbase
 interface translation server pattern: profiles/varbase/translations/%language.po
diff --git a/varbase.install b/varbase.install
index e9097f62..ca51262d 100644
--- a/varbase.install
+++ b/varbase.install
@@ -6,9 +6,13 @@
  */
 
 use Symfony\Component\Yaml\Yaml;
+use Drupal\Core\Config;
+use Drupal\Core\Config\InstallStorage;
+use Drupal\Core\Config\StorageInterface;
+use Drupal\Core\Config\ExtensionInstallStorage;
+use Drupal\Core\Config\FileStorage;
 use Drupal\user\Entity\User;
 use Drupal\user\RoleInterface;
-use Drupal\shortcut\Entity\Shortcut;
 
 /**
  * Implements hook_install().
@@ -18,82 +22,20 @@ use Drupal\shortcut\Entity\Shortcut;
  * @see system_install()
  */
 function varbase_install() {
-  // Set front page to "node".
-  \Drupal::configFactory()->getEditable('system.site')->set('page.front', '/node')->save(TRUE);
-
-  // Assign user 1 the "administrator" role.
-  $user = User::load(1);
-  $user->roles[] = 'administrator';
-  $user->save();
-
-  // Restrict user registration to admin role creation.
-  \Drupal::configFactory()->getEditable('user.settings')->set('register', USER_REGISTER_ADMINISTRATORS_ONLY)->save(TRUE);
-
-  // Allow authenticated users to use shortcuts.
-  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, ['access shortcuts']);
-
-  // Populate the default shortcut set.
-  $shortcut = Shortcut::create(array(
-    'shortcut_set' => 'default',
-    'title' => t('Add content'),
-    'weight' => 0,
-    'link' => array('uri' => 'internal:/node/add'),
-  ));
-  $shortcut->save();
-
-  $shortcut = Shortcut::create(array(
-    'shortcut_set' => 'default',
-    'title' => t('All content'),
-    'weight' => 1,
-    'link' => array('uri' => 'internal:/admin/content'),
-  ));
-  $shortcut->save();
 
-  $shortcut = Shortcut::create(array(
-    'shortcut_set' => 'default',
-    'title' => t('All media'),
-    'weight' => 2,
-    'link' => array('uri' => 'internal:/admin/content/media'),
-  ));
-  $shortcut->save();
-
-  $shortcut = Shortcut::create(array(
-    'shortcut_set' => 'default',
-    'title' => t('Taxonomy'),
-    'weight' => 3,
-    'link' => array('uri' => 'internal:/admin/structure/taxonomy'),
-  ));
-  $shortcut->save();
-
-  $shortcut = Shortcut::create(array(
-    'shortcut_set' => 'default',
-    'title' => t('Permissions'),
-    'weight' => 4,
-    'link' => array('uri' => 'internal:/admin/people/permissions'),
-  ));
-  $shortcut->save();
-
-  // Allow all users to use search.
-  user_role_grant_permissions(RoleInterface::ANONYMOUS_ID, array('search content'));
-  user_role_grant_permissions(RoleInterface::AUTHENTICATED_ID, array('search content'));
+  // Install optional configs.
+  $config_installer = \Drupal::service('config.installer');
+  $optional_install_path = drupal_get_path('profile', 'varbase') . '/' . InstallStorage::CONFIG_OPTIONAL_DIRECTORY;
+  if (is_dir($optional_install_path)) {
+    // Install any optional config the profile provides.
+    $storage = new FileStorage($optional_install_path, StorageInterface::DEFAULT_COLLECTION);
+    $config_installer->installOptionalConfig($storage, '');
+  }
+  // ---------------------------------------------------------------------------
 
-  // Enable the admin theme.
-  \Drupal::configFactory()->getEditable('node.settings')->set('use_admin_theme', TRUE)->save(TRUE);
+  // Set front page to "node".
+  \Drupal::configFactory()->getEditable('system.site')->set('page.front', '/node')->save(TRUE);
 
-  // Entity updates to clear up any mismatched entity and/or field definitions
-  // And Fix changes were detected in the entity type and field definitions.
-  \Drupal::entityDefinitionUpdateManager()->applyUpdates();
-  
-  // Activate Varbase Bootstrap Paragraphs Settings in the active config.
-  if (\Drupal::moduleHandler()->moduleExists('varbase_bootstrap_paragraphs')) {
-    $profile_path = drupal_get_path('profile', 'varbase') . '/config/optional/';
-    $config_path = $profile_path . 'varbase_bootstrap_paragraphs.settings.yml';
-    $config_content = file_get_contents($config_path);
-    $config_data = (array) Yaml::parse($config_content);
-    $config_factory = \Drupal::configFactory()->getEditable('varbase_bootstrap_paragraphs.settings');
-    $config_factory->setData($config_data)->save(TRUE);
-  }
-  
   // If Varbase Tour were enabled then redirect to the homepage with activ tour.
   if (isset($GLOBALS['homepage_with_varbase_tour'])
     && $GLOBALS['homepage_with_varbase_tour'] == TRUE) {
-- 
GitLab