diff --git a/README.md b/README.md
index 07b5a17..2412e9d 100644
--- a/README.md
+++ b/README.md
@@ -207,4 +207,5 @@ This project has been sponsored by:
    (http://www.mediacurrent.com) for more information.
 
  * Acquia
-   Commercially Supported Drupal. Visit (http://acquia.com) for more information.
+   Commercially Supported Drupal. Visit (http://acquia.com) 
+   for more information.
diff --git a/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml b/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml
index 2a80b98..e31e6a4 100644
--- a/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml
+++ b/modules/pdb_ng2/components/ng2_example_1/ng2_example_1.info.yml
@@ -3,6 +3,6 @@ machine_name: ng2-example-1
 type: pdb
 description: 'NG 2 Example Component 1'
 category: NG2
-version: '1.0.0'
+core_version_requirement: ^8 || ^9 || ^10
 module_status: active
 presentation: ng2
diff --git a/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml b/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml
index 7b514a3..f494b40 100644
--- a/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml
+++ b/modules/pdb_ng2/components/ng2_example_2/ng2_example_2.info.yml
@@ -3,6 +3,6 @@ machine_name: ng2-example-2
 type: pdb
 description: 'NG 2 Example Component 2'
 category: NG2
-version: '1.0.0'
 module_status: active
 presentation: ng2
+core_version_requirement: ^9 || ^10
diff --git a/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml b/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml
index c402517..98eef56 100644
--- a/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml
+++ b/modules/pdb_ng2/components/ng2_example_configuration/ng2_example_configuration.info.yml
@@ -3,7 +3,7 @@ machine_name: ng2-example-configuration
 type: pdb
 description: 'NG 2 Example Component Configuration'
 category: NG2
-version: '1.0.0'
+core_version_requirement: ^8 || ^9 || ^10
 module_status: active
 presentation: ng2
 configuration:
diff --git a/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml b/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml
index 8902b9f..8dc89cb 100644
--- a/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml
+++ b/modules/pdb_ng2/components/ng2_example_node/ng2_example_node.info.yml
@@ -3,8 +3,8 @@ machine_name: ng2-example-node
 type: pdb
 description: 'NG 2 Example Component Node'
 category: NG2
-version: '1.0.0'
 module_status: active
 presentation: ng2
 contexts:
   entity: node
+core_version_requirement: ^9 || ^10
diff --git a/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml b/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml
index 295a312..d738637 100644
--- a/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml
+++ b/modules/pdb_ng2/components/ng2_hero/ng2_hero.info.yml
@@ -3,6 +3,6 @@ machine_name: ng2-hero
 type: pdb
 description: 'NG 2 Hero block, a basic example'
 category: NG2
-version: '1.0.0'
+core_version_requirement: ^9 || ^10
 module_status: active
 presentation: ng2
diff --git a/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml b/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml
index cb12afa..af5f978 100644
--- a/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml
+++ b/modules/pdb_ng2/components/ng2_todo/ng2_todo.info.yml
@@ -3,6 +3,6 @@ machine_name: ng2-todo
 type: pdb
 description: 'NG 2 ToDo example component'
 category: NG2
-version: '1.0.0'
 module_status: active
 presentation: ng2
+core_version_requirement: ^9 || ^10
diff --git a/modules/pdb_ng2/components/ng2_todo/style.css b/modules/pdb_ng2/components/ng2_todo/style.css
index 294d40e..73356f7 100644
--- a/modules/pdb_ng2/components/ng2_todo/style.css
+++ b/modules/pdb_ng2/components/ng2_todo/style.css
@@ -241,11 +241,7 @@ label[for='toggle-all'] {
   left: 0;
   height: 50px;
   overflow: hidden;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
-  0 8px 0 -3px #f6f6f6,
-  0 9px 1px -3px rgba(0, 0, 0, 0.2),
-  0 16px 0 -6px #f6f6f6,
-  0 17px 2px -6px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 8px 0 -3px #f6f6f6, 0 9px 1px -3px rgba(0, 0, 0, 0.2), 0 16px 0 -6px #f6f6f6, 0 17px 2px -6px rgba(0, 0, 0, 0.2);
 }
 
 .todo-count {
diff --git a/modules/pdb_ng2/pdb_ng2.info.yml b/modules/pdb_ng2/pdb_ng2.info.yml
index 5656496..87ae98b 100644
--- a/modules/pdb_ng2/pdb_ng2.info.yml
+++ b/modules/pdb_ng2/pdb_ng2.info.yml
@@ -5,4 +5,4 @@ package: PDB
 configure: pdb_ng2.form
 core_version_requirement: ^9 || ^10
 dependencies:
-  - pdb
+  - drupal:pdb
diff --git a/modules/pdb_ng2/pdb_ng2.module b/modules/pdb_ng2/pdb_ng2.module
index 52febbd..64fcd7f 100644
--- a/modules/pdb_ng2/pdb_ng2.module
+++ b/modules/pdb_ng2/pdb_ng2.module
@@ -5,11 +5,11 @@
  * Any procedural Angular 2 PHP work lives here.
  */
 
-
 /**
  * Add our component paths for Angular 2.
  *
  * @param object $components
+ *   Components variable.
  */
 function pdb_ng2_component_info_alter($components) {
   // Read info files for each module.
@@ -18,14 +18,14 @@ function pdb_ng2_component_info_alter($components) {
     if ($component->info['presentation'] == 'ng2' && empty($component->info['path'])) {
       // Use js or ts sourcing depending on development mode.
       $config_settings = \Drupal::config('pdb_ng2.settings');
-      $ext = 'js';
+      // $ext = 'js';
       if (isset($config_settings) && $config_settings->get('development_mode')) {
-        $ext = 'ts';
+        // $ext = 'ts';
       }
       $component->info['path'] = $component->getPath();
     }
     else {
-      $path = isset($component->info['path']) ? $component->info['path'] : '';
+      $path = $component->info['path'] ?? '';
       if (!empty($path) && $path[0] != '/') {
         $component->info['path'] = $component->getPath() . '/' . $path;
       }
diff --git a/modules/pdb_ng2/pdb_ng2.routing.yml b/modules/pdb_ng2/pdb_ng2.routing.yml
index 6ee5121..c6f81fe 100644
--- a/modules/pdb_ng2/pdb_ng2.routing.yml
+++ b/modules/pdb_ng2/pdb_ng2.routing.yml
@@ -4,4 +4,4 @@ pdb_ng2.form:
     _title: 'PDB Angular2'
     _form: '\Drupal\pdb_ng2\Form\PdbNg2Form'
   requirements:
-    _permission: 'access administration pages'
+    _permission: 'administer site configuration'
diff --git a/modules/pdb_ng2/src/Form/PdbNg2Form.php b/modules/pdb_ng2/src/Form/PdbNg2Form.php
index 8d8f59c..86c7870 100644
--- a/modules/pdb_ng2/src/Form/PdbNg2Form.php
+++ b/modules/pdb_ng2/src/Form/PdbNg2Form.php
@@ -6,7 +6,7 @@ use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
- * Class PdbNg2Form.
+ * Provides a form for Ng2 specific settings.
  *
  * @package Drupal\pdb_ng2\Form
  */
@@ -48,8 +48,7 @@ class PdbNg2Form extends ConfigFormBase {
     // Set variables based on form values.
     $development_mode = $form_state->getValue('development_mode');
     // Get the config object.
-    $config = \Drupal::service('config.factory')
-      ->getEditable('pdb_ng2.settings');
+    $config = $this->configFactory->getEditable('pdb_ng2.settings');
     // Set the values the user submitted in the form.
     $config->set('development_mode', $development_mode);
     $config->save();
diff --git a/modules/pdb_react/components/react_example_1/react_example_1.info.yml b/modules/pdb_react/components/react_example_1/react_example_1.info.yml
index afd6482..5a0fdf4 100644
--- a/modules/pdb_react/components/react_example_1/react_example_1.info.yml
+++ b/modules/pdb_react/components/react_example_1/react_example_1.info.yml
@@ -3,7 +3,7 @@ machine_name: react-example-1
 type: pdb
 description: 'React Example Component 1'
 category: React
-version: '1.0.0'
+core_version_requirement: ^8 || ^9 || ^10
 module_status: active
 presentation: react
 add_js:
diff --git a/modules/pdb_react/components/react_todo/css/index.css b/modules/pdb_react/components/react_todo/css/index.css
index c6ad8cd..e38f967 100644
--- a/modules/pdb_react/components/react_todo/css/index.css
+++ b/modules/pdb_react/components/react_todo/css/index.css
@@ -2,8 +2,7 @@
   background: #fff;
   margin: 130px 0 40px 0;
   position: relative;
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2),
-  0 25px 50px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 25px 50px 0 rgba(0, 0, 0, 0.1);
 }
 
 .todoapp input::-webkit-input-placeholder {
@@ -213,11 +212,7 @@ label[for='toggle-all'] {
   left: 0;
   height: 50px;
   overflow: hidden;
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2),
-  0 8px 0 -3px #f6f6f6,
-  0 9px 1px -3px rgba(0, 0, 0, 0.2),
-  0 16px 0 -6px #f6f6f6,
-  0 17px 2px -6px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2), 0 8px 0 -3px #f6f6f6, 0 9px 1px -3px rgba(0, 0, 0, 0.2), 0 16px 0 -6px #f6f6f6, 0 17px 2px -6px rgba(0, 0, 0, 0.2);
 }
 
 .todo-count {
diff --git a/modules/pdb_react/components/react_todo/react_todo.info.yml b/modules/pdb_react/components/react_todo/react_todo.info.yml
index 394179c..3883f77 100644
--- a/modules/pdb_react/components/react_todo/react_todo.info.yml
+++ b/modules/pdb_react/components/react_todo/react_todo.info.yml
@@ -3,9 +3,9 @@ machine_name: react-todo
 type: pdb
 description: 'React ToDo'
 category: React
-version: '1.0.0'
 module_status: active
 presentation: react
+core_version_requirement: ^9 || ^10
 add_js:
   footer:
     'node_modules/todomvc-common/base.js': {}
diff --git a/modules/pdb_react/pdb_react.info.yml b/modules/pdb_react/pdb_react.info.yml
index 32a276d..c7d67fe 100644
--- a/modules/pdb_react/pdb_react.info.yml
+++ b/modules/pdb_react/pdb_react.info.yml
@@ -4,4 +4,4 @@ description: 'Turns on react framework for use by PDB'
 package: PDB
 core_version_requirement: ^9 || ^10
 dependencies:
-  - pdb
+  - drupal:pdb
diff --git a/src/ComponentDiscovery.php b/src/ComponentDiscovery.php
index 264a46d..7a402ae 100644
--- a/src/ComponentDiscovery.php
+++ b/src/ComponentDiscovery.php
@@ -2,17 +2,16 @@
 
 namespace Drupal\pdb;
 
-use Drupal\pdb\Discovery\PdbRecursiveExtensionFilterIterator;
-use Drupal\pdb\Event\PdbDiscoveryEvent;
-
+use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
+use Drupal\Core\Extension\Extension;
 use Drupal\Core\Extension\ExtensionDiscovery;
 use Drupal\Core\Extension\InfoParserException;
 use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\Extension\Extension;
+use Drupal\Core\Serialization\Yaml;
 use Drupal\Core\Site\Settings;
+use Drupal\pdb\Discovery\PdbRecursiveExtensionFilterIterator;
+use Drupal\pdb\Event\PdbDiscoveryEvent;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Drupal\Component\Serialization\Exception\InvalidDataTypeException;
-use Drupal\Core\Serialization\Yaml;
 
 /**
  * Discovery service for front-end components provided by modules and themes.
@@ -112,7 +111,7 @@ class ComponentDiscovery extends ExtensionDiscovery implements ComponentDiscover
       return parent::scan($type, $include_tests);
     }
 
-    // Based on parent::scan().
+    /* From here, based on parent::scan(). */
 
     $files = [];
     foreach ($search_dirs as $dir) {
@@ -149,7 +148,7 @@ class ComponentDiscovery extends ExtensionDiscovery implements ComponentDiscover
       return parent::scanDirectory($dir, $include_tests);
     }
 
-    // Based on parent::scanDirectory().
+    /* From here, based on parent::scanDirectory(). */
 
     $files = [];
 
diff --git a/src/Plugin/Block/PdbBlock.php b/src/Plugin/Block/PdbBlock.php
index ce23fc9..97abbd7 100644
--- a/src/Plugin/Block/PdbBlock.php
+++ b/src/Plugin/Block/PdbBlock.php
@@ -11,7 +11,7 @@ use Drupal\pdb\FrameworkAwareBlockInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Class PdbBlock.
+ * Provides a base class with core logic for PDB components.
  *
  * @package Drupal\pdb\Plugin\Block
  */
@@ -227,7 +227,7 @@ abstract class PdbBlock extends BlockBase implements FrameworkAwareBlockInterfac
       }
 
       foreach ($entity as $field_name => $field) {
-        // @var \Drupal\Core\Field\FieldItemListInterface $field
+        /** @var \Drupal\Core\Field\FieldItemListInterface $field */
         $field_access = $field->access('view', NULL, TRUE);
 
         // @todo Used addCacheableDependency($field_access);
@@ -240,24 +240,6 @@ abstract class PdbBlock extends BlockBase implements FrameworkAwareBlockInterfac
     }
   }
 
-  /**
-   * Add serialized entity to the JS Contexts.
-   *
-   * @param \Drupal\Core\Entity\Plugin\DataType\EntityAdapter $data
-   *   The entity to serialize.
-   * @param array $js_contexts
-   *   The full array of JS contexts.
-   * @param string $key
-   *   The context key.
-   *
-   * @deprecated in pdb:8.x-1.0 and is removed from pdb:2.0.0.
-   *   Instead, you should just use ::getContextEntityValue().
-   */
-  protected function addEntityJsContext(EntityAdapter $data, array &$js_contexts, $key) {
-    @trigger_error('addEntityJsContext() is deprecated in pdb:8.x-1.0 and is removed from pdb:2.0.0. Use ::getContextEntityValue() instead.', E_USER_DEPRECATED);
-    $this->getContextEntityValue($key, $data, $js_contexts);
-  }
-
   /**
    * Get an array of serialized JS contexts.
    *
diff --git a/tests/src/Unit/Plugin/Block/PdbBlockTest.php b/tests/src/Unit/Plugin/Block/PdbBlockTest.php
index 157d4fd..1b1c2d8 100644
--- a/tests/src/Unit/Plugin/Block/PdbBlockTest.php
+++ b/tests/src/Unit/Plugin/Block/PdbBlockTest.php
@@ -4,9 +4,8 @@ namespace Drupal\Tests\pdb\Unit\Plugin\Block;
 
 use Drupal\Component\Uuid\UuidInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Plugin\ContextAwarePluginInterface;
-use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Plugin\Context\EntityContextDefinition;
+use Drupal\Core\Plugin\ContextAwarePluginInterface;
 use Drupal\pdb\Plugin\Block\PdbBlock;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -60,7 +59,9 @@ class PdbBlockTest extends UnitTestCase {
           ],
         ],
         'settings' => [
-          'pdb' => ['settings test'],
+          'pdb' => [
+            'settings test' => 1,
+          ],
         ],
         'configuration' => [
           'testField' => [
@@ -83,26 +84,44 @@ class PdbBlockTest extends UnitTestCase {
     // Create a new instance from the Abstract Class.
     $anonymous_class_from_abstract = new class($configuration, $plugin_id, $plugin_definition, $uuid_service) extends PdbBlock {
 
+      /**
+       * Return class instance.
+       */
       public function returnThis() {
         return $this;
       }
 
+      /**
+       * Attach framework stuff.
+       */
       public function attachFramework(array $component) {
         return ['drupalSettings' => ['pdb' => ['webcomponents' => []]]];
       }
 
+      /**
+       * Attach page header stuff.
+       */
       public function attachPageHeader(array $component) {
         return ['page_attachment'];
       }
 
+      /**
+       * Get current context values.
+       */
       protected function getContextsValues(array $contexts) {
         return ['context_key' => 'context_value'];
       }
 
+      /**
+       * Get current context values for JS usage.
+       */
       protected function getJsContexts(array $contexts) {
         return ['context_key' => 'context_value'];
       }
 
+      /**
+       * Context assignment element.
+       */
       protected function addContextAssignmentElement(ContextAwarePluginInterface $plugin, array $contexts) {
         return 'context';
       }
@@ -111,7 +130,7 @@ class PdbBlockTest extends UnitTestCase {
 
     $this->plugin = $anonymous_class_from_abstract->returnThis();
 
-    // Create a translation stub for the t() method
+    // Create a translation stub for the t() method.
     $translator = $this->getStringTranslationStub();
     $this->plugin->setStringTranslation($translator);
   }
@@ -124,7 +143,7 @@ class PdbBlockTest extends UnitTestCase {
       '#attached' => [
         'drupalSettings' => [
           'pdb' => [
-            'settings test',
+            'settings test' => 1,
             'webcomponents' => [],
             'configuration' => [
               'uuid' => [
@@ -140,8 +159,8 @@ class PdbBlockTest extends UnitTestCase {
             ],
           ],
         ],
-        'pdb/example-1/footer',
-        'page_attachment',
+        0 => 'pdb/example-1/footer',
+        1 => 'page_attachment',
       ],
     ];
 
diff --git a/tests/src/Unit/Plugin/Derivative/PdbBlockDeriverTest.php b/tests/src/Unit/Plugin/Derivative/PdbBlockDeriverTest.php
index d1ef70d..93f95c8 100644
--- a/tests/src/Unit/Plugin/Derivative/PdbBlockDeriverTest.php
+++ b/tests/src/Unit/Plugin/Derivative/PdbBlockDeriverTest.php
@@ -2,8 +2,8 @@
 
 namespace Drupal\Tests\pdb\Unit\Plugin\Derivative;
 
-use Drupal\pdb\Plugin\Derivative\PdbBlockDeriver;
 use Drupal\pdb\ComponentDiscoveryInterface;
+use Drupal\pdb\Plugin\Derivative\PdbBlockDeriver;
 use Drupal\Tests\UnitTestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\DependencyInjection\ContainerInterface;