diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9eb6e15..8ef6985 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,106 +1,114 @@
 # CHANGELOG
 
+## 2.1.0
+
+### Changed
+
+- Metabox.io plugin by the open-source CMB2 plugin to align with OpenWebConcept's policy of using open-source plugins (fully backward-compatible)
+- Updated translations
+- License
+
 ## 2.0.0
 
 ### Added
 
-- Register REST endpoints.
-- Replaced commands with WP Cron Events, reducing the need for server cron job configuration.
-- Updated `README.md`.
+- Register REST endpoints
+- Replaced commands with WP Cron Events, reducing the need for server cron job configuration
+- Updated `README.md`
 
 ## 1.2.5
 
 ### Changed
 
-- No changes. Corrects version and git tag which were out of sync.
+- No changes. Corrects version and git tag which were out of sync
 
 ## 1.2.4
 
 ### Changed
 
-- No changes. Corrects version and git tag which were out of sync.
+- No changes. Corrects version and git tag which were out of sync
 
 ## 1.2.3
 
 ### Fixed
 
-- Avoid exiting with an error code when there is nothing to update.
+- Avoid exiting with an error code when there is nothing to update
 
 ## 1.2.2
 
 ### Added
 
-- Added search box to find leges items by ID.
+- Added search box to find leges items by ID
 
 ## 1.2.1
 
 ### Fixed
 
-- Missing PHP extension when running GH workflows.
+- Missing PHP extension when running GH workflows
 
 ## 1.2.0
 
 ### Added
 
-- Updates can now be provided through the Admin interface.
+- Updates can now be provided through the Admin interface
 
 ## 1.1.4
 
 ### Changed
 
-- Replaced Composer plugin dependency check with runtime check.
+- Replaced Composer plugin dependency check with runtime check
 
 ## 1.1.3
 
 ### Fixed
 
-- Validate `datActive` in `dateIsNow` inside Shortcode class.
+- Validate `datActive` in `dateIsNow` inside Shortcode class
 
 ## 1.1.2
 
 ### Changed
 
-- Update dependencies and reference pdc-base plugin from BitBucket to GitHub.
+- Update dependencies and reference pdc-base plugin from BitBucket to GitHub
 
 ## 1.1.1
 
 ### Fixed
 
-- Fix new lege price date comparison.
+- Fix new lege price date comparison
 
 ## 1.1.0
 
 ### Added
 
-- Update lege prices via WP_CLI command.
+- Update lege prices via WP_CLI command
 
 ## 1.0.4
 
 ### Changed
 
-- Composer dependency on pdc-base plug-in updated from `^2.0.0` to `^3.0.0`.
+- Composer dependency on pdc-base plug-in updated from `^2.0.0` to `^3.0.0`
 
 ## 1.0.3
 
 ### Fixed
 
-- WordPress 5.3 class and style changes caused issues with quickedit functionality.
+- WordPress 5.3 class and style changes caused issues with quickedit functionality
 
 ## 1.0.2
 
 ### Added
 
-- Adding of admin column.
+- Adding of admin column
 
 ## 1.0.1
 
 ### Fixed
 
-- Check if required file for `is_plugin_active` is already loaded, otherwise load it. Props @Jasper Heidebrink.
+- Check if required file for `is_plugin_active` is already loaded, otherwise load it. Props @Jasper Heidebrink
 
 ## 1.0.0
 
 ### Added
 
-- Initial release.
-- Added documentation.
+- Initial release
+- Added documentation
diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..abef2b0
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,288 @@
+# EUROPEAN UNION PUBLIC LICENCE v. 1.2
+
+EUPL © the European Union 2007, 2016
+
+This European Union Public Licence (the ‘EUPL’) applies to the Work (as defined
+below) which is provided under the terms of this Licence. Any use of the Work,
+other than as authorised under this Licence is prohibited (to the extent such
+use is covered by a right of the copyright holder of the Work).
+
+The Work is provided under the terms of this Licence when the Licensor (as
+defined below) has placed the following notice immediately following the
+copyright notice for the Work:
+
+    Licensed under the EUPL
+
+or has expressed by any other means his willingness to license under the EUPL.
+
+## 1. Definitions
+
+In this Licence, the following terms have the following meaning:
+
+- ‘The Licence’: this Licence.
+
+- ‘The Original Work’: the work or software distributed or communicated by the
+    Licensor under this Licence, available as Source Code and also as Executable
+    Code as the case may be.
+
+- ‘Derivative Works’: the works or software that could be created by the
+    Licensee, based upon the Original Work or modifications thereof. This Licence
+    does not define the extent of modification or dependence on the Original Work
+    required in order to classify a work as a Derivative Work; this extent is
+    determined by copyright law applicable in the country mentioned in Article 15.
+
+- ‘The Work’: the Original Work or its Derivative Works.
+
+- ‘The Source Code’: the human-readable form of the Work which is the most
+    convenient for people to study and modify.
+
+- ‘The Executable Code’: any code which has generally been compiled and which is
+    meant to be interpreted by a computer as a program.
+
+- ‘The Licensor’: the natural or legal person that distributes or communicates
+    the Work under the Licence.
+
+- ‘Contributor(s)’: any natural or legal person who modifies the Work under the
+    Licence, or otherwise contributes to the creation of a Derivative Work.
+
+- ‘The Licensee’ or ‘You’: any natural or legal person who makes any usage of
+    the Work under the terms of the Licence.
+
+- ‘Distribution’ or ‘Communication’: any act of selling, giving, lending,
+    renting, distributing, communicating, transmitting, or otherwise making
+    available, online or offline, copies of the Work or providing access to its
+    essential functionalities at the disposal of any other natural or legal
+    person.
+
+## 2. Scope of the rights granted by the Licence
+
+The Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+sublicensable licence to do the following, for the duration of copyright vested
+in the Original Work:
+
+- use the Work in any circumstance and for all usage,
+- reproduce the Work,
+- modify the Work, and make Derivative Works based upon the Work,
+- communicate to the public, including the right to make available or display
+    the Work or copies thereof to the public and perform publicly, as the case may
+    be, the Work,
+- distribute the Work or copies thereof,
+- lend and rent the Work or copies thereof,
+- sublicense rights in the Work or copies thereof.
+
+Those rights can be exercised on any media, supports and formats, whether now
+known or later invented, as far as the applicable law permits so.
+
+In the countries where moral rights apply, the Licensor waives his right to
+exercise his moral right to the extent allowed by law in order to make effective
+the licence of the economic rights here above listed.
+
+The Licensor grants to the Licensee royalty-free, non-exclusive usage rights to
+any patents held by the Licensor, to the extent necessary to make use of the
+rights granted on the Work under this Licence.
+
+## 3. Communication of the Source Code
+
+The Licensor may provide the Work either in its Source Code form, or as
+Executable Code. If the Work is provided as Executable Code, the Licensor
+provides in addition a machine-readable copy of the Source Code of the Work
+along with each copy of the Work that the Licensor distributes or indicates, in
+a notice following the copyright notice attached to the Work, a repository where
+the Source Code is easily and freely accessible for as long as the Licensor
+continues to distribute or communicate the Work.
+
+## 4. Limitations on copyright
+
+Nothing in this Licence is intended to deprive the Licensee of the benefits from
+any exception or limitation to the exclusive rights of the rights owners in the
+Work, of the exhaustion of those rights or of other applicable limitations
+thereto.
+
+## 5. Obligations of the Licensee
+
+The grant of the rights mentioned above is subject to some restrictions and
+obligations imposed on the Licensee. Those obligations are the following:
+
+Attribution right: The Licensee shall keep intact all copyright, patent or
+trademarks notices and all notices that refer to the Licence and to the
+disclaimer of warranties. The Licensee must include a copy of such notices and a
+copy of the Licence with every copy of the Work he/she distributes or
+communicates. The Licensee must cause any Derivative Work to carry prominent
+notices stating that the Work has been modified and the date of modification.
+
+Copyleft clause: If the Licensee distributes or communicates copies of the
+Original Works or Derivative Works, this Distribution or Communication will be
+done under the terms of this Licence or of a later version of this Licence
+unless the Original Work is expressly distributed only under this version of the
+Licence — for example by communicating ‘EUPL v. 1.2 only’. The Licensee
+(becoming Licensor) cannot offer or impose any additional terms or conditions on
+the Work or Derivative Work that alter or restrict the terms of the Licence.
+
+Compatibility clause: If the Licensee Distributes or Communicates Derivative
+Works or copies thereof based upon both the Work and another work licensed under
+a Compatible Licence, this Distribution or Communication can be done under the
+terms of this Compatible Licence. For the sake of this clause, ‘Compatible
+Licence’ refers to the licences listed in the appendix attached to this Licence.
+Should the Licensee's obligations under the Compatible Licence conflict with
+his/her obligations under this Licence, the obligations of the Compatible
+Licence shall prevail.
+
+Provision of Source Code: When distributing or communicating copies of the Work,
+the Licensee will provide a machine-readable copy of the Source Code or indicate
+a repository where this Source will be easily and freely available for as long
+as the Licensee continues to distribute or communicate the Work.
+
+Legal Protection: This Licence does not grant permission to use the trade names,
+trademarks, service marks, or names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the copyright notice.
+
+## 6. Chain of Authorship
+
+The original Licensor warrants that the copyright in the Original Work granted
+hereunder is owned by him/her or licensed to him/her and that he/she has the
+power and authority to grant the Licence.
+
+Each Contributor warrants that the copyright in the modifications he/she brings
+to the Work are owned by him/her or licensed to him/her and that he/she has the
+power and authority to grant the Licence.
+
+Each time You accept the Licence, the original Licensor and subsequent
+Contributors grant You a licence to their contributions to the Work, under the
+terms of this Licence.
+
+## 7. Disclaimer of Warranty
+
+The Work is a work in progress, which is continuously improved by numerous
+Contributors. It is not a finished work and may therefore contain defects or
+‘bugs’ inherent to this type of development.
+
+For the above reason, the Work is provided under the Licence on an ‘as is’ basis
+and without warranties of any kind concerning the Work, including without
+limitation merchantability, fitness for a particular purpose, absence of defects
+or errors, accuracy, non-infringement of intellectual property rights other than
+copyright as stated in Article 6 of this Licence.
+
+This disclaimer of warranty is an essential part of the Licence and a condition
+for the grant of any rights to the Work.
+
+## 8. Disclaimer of Liability
+
+Except in the cases of wilful misconduct or damages directly caused to natural
+persons, the Licensor will in no event be liable for any direct or indirect,
+material or moral, damages of any kind, arising out of the Licence or of the use
+of the Work, including without limitation, damages for loss of goodwill, work
+stoppage, computer failure or malfunction, loss of data or any commercial
+damage, even if the Licensor has been advised of the possibility of such damage.
+However, the Licensor will be liable under statutory product liability laws as
+far such laws apply to the Work.
+
+## 9. Additional agreements
+
+While distributing the Work, You may choose to conclude an additional agreement,
+defining obligations or services consistent with this Licence. However, if
+accepting obligations, You may act only on your own behalf and on your sole
+responsibility, not on behalf of the original Licensor or any other Contributor,
+and only if You agree to indemnify, defend, and hold each Contributor harmless
+for any liability incurred by, or claims asserted against such Contributor by
+the fact You have accepted any warranty or additional liability.
+
+## 10. Acceptance of the Licence
+
+The provisions of this Licence can be accepted by clicking on an icon ‘I agree’
+placed under the bottom of a window displaying the text of this Licence or by
+affirming consent in any other similar way, in accordance with the rules of
+applicable law. Clicking on that icon indicates your clear and irrevocable
+acceptance of this Licence and all of its terms and conditions.
+
+Similarly, you irrevocably accept this Licence and all of its terms and
+conditions by exercising any rights granted to You by Article 2 of this Licence,
+such as the use of the Work, the creation by You of a Derivative Work or the
+Distribution or Communication by You of the Work or copies thereof.
+
+## 11. Information to the public
+
+In case of any Distribution or Communication of the Work by means of electronic
+communication by You (for example, by offering to download the Work from a
+remote location) the distribution channel or media (for example, a website) must
+at least provide to the public the information requested by the applicable law
+regarding the Licensor, the Licence and the way it may be accessible, concluded,
+stored and reproduced by the Licensee.
+
+## 12. Termination of the Licence
+
+The Licence and the rights granted hereunder will terminate automatically upon
+any breach by the Licensee of the terms of the Licence.
+
+Such a termination will not terminate the licences of any person who has
+received the Work from the Licensee under the Licence, provided such persons
+remain in full compliance with the Licence.
+
+## 13. Miscellaneous
+
+Without prejudice of Article 9 above, the Licence represents the complete
+agreement between the Parties as to the Work.
+
+If any provision of the Licence is invalid or unenforceable under applicable
+law, this will not affect the validity or enforceability of the Licence as a
+whole. Such provision will be construed or reformed so as necessary to make it
+valid and enforceable.
+
+The European Commission may publish other linguistic versions or new versions of
+this Licence or updated versions of the Appendix, so far this is required and
+reasonable, without reducing the scope of the rights granted by the Licence. New
+versions of the Licence will be published with a unique version number.
+
+All linguistic versions of this Licence, approved by the European Commission,
+have identical value. Parties can take advantage of the linguistic version of
+their choice.
+
+## 14. Jurisdiction
+
+Without prejudice to specific agreement between parties,
+
+- any litigation resulting from the interpretation of this License, arising
+    between the European Union institutions, bodies, offices or agencies, as a
+    Licensor, and any Licensee, will be subject to the jurisdiction of the Court
+    of Justice of the European Union, as laid down in article 272 of the Treaty on
+    the Functioning of the European Union,
+
+- any litigation arising between other parties and resulting from the
+    interpretation of this License, will be subject to the exclusive jurisdiction
+    of the competent court where the Licensor resides or conducts its primary
+    business.
+
+## 15. Applicable Law
+
+Without prejudice to specific agreement between parties,
+
+- this Licence shall be governed by the law of the European Union Member State
+    where the Licensor has his seat, resides or has his registered office,
+
+- this licence shall be governed by Belgian law if the Licensor has no seat,
+    residence or registered office inside a European Union Member State.
+
+## Appendix
+
+‘Compatible Licences’ according to Article 5 EUPL are:
+
+- GNU General Public License (GPL) v. 2, v. 3
+- GNU Affero General Public License (AGPL) v. 3
+- Open Software License (OSL) v. 2.1, v. 3.0
+- Eclipse Public License (EPL) v. 1.0
+- CeCILL v. 2.0, v. 2.1
+- Mozilla Public Licence (MPL) v. 2
+- GNU Lesser General Public Licence (LGPL) v. 2.1, v. 3
+- Creative Commons Attribution-ShareAlike v. 3.0 Unported (CC BY-SA 3.0) for
+    works other than software
+- European Union Public Licence (EUPL) v. 1.1, v. 1.2
+- Québec Free and Open-Source Licence — Reciprocity (LiLiQ-R) or Strong
+    Reciprocity (LiLiQ-R+).
+
+The European Commission may update this Appendix to later versions of the above
+licences without producing a new version of the EUPL, as long as they provide
+the rights granted in Article 2 of this Licence and protect the covered Source
+Code from exclusive appropriation.
+
+All other changes or additions to this Appendix require the production of a new
+EUPL version.
diff --git a/composer.json b/composer.json
index 5cb17c6..5a3cb10 100644
--- a/composer.json
+++ b/composer.json
@@ -10,6 +10,10 @@
   ],
   "type": "wordpress-plugin",
   "repositories": [
+    {
+      "type": "composer",
+      "url": "https://wpackagist.org"
+    },
     {
       "type": "vcs",
       "url": "git@github.com:OpenWebconcept/plugin-pdc-base.git"
@@ -19,8 +23,9 @@
     "php": "^7.4|^8.0",
     "yahnis-elsts/plugin-update-checker": "^5.1",
     "johnpbloch/wordpress": "6.*",
+    "plugin/pdc-base": "3.*",
     "wp-cli/wp-cli": "2.*",
-    "plugin/pdc-base": "3.*"
+    "wpackagist-plugin/cmb2": "2.11.*"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^3.0",
@@ -52,7 +57,8 @@
   },
   "config": {
     "allow-plugins": {
-      "johnpbloch/wordpress-core-installer": true
+      "johnpbloch/wordpress-core-installer": true,
+      "composer/installers": true
     }
   }
 }
diff --git a/composer.lock b/composer.lock
index d0714f8..d16d2e9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,154 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e0e5f1636f585317e3fc42d82fe7c511",
+    "content-hash": "c2b57cf66cba97c6d0490b93630e1365",
     "packages": [
+        {
+            "name": "composer/installers",
+            "version": "v2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/12fb2dfe5e16183de69e784a7b84046c43d97e8e",
+                "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0 || ^2.0",
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "composer/composer": "^1.10.27 || ^2.7",
+                "composer/semver": "^1.7.2 || ^3.4.0",
+                "phpstan/phpstan": "^1.11",
+                "phpstan/phpstan-phpunit": "^1",
+                "symfony/phpunit-bridge": "^7.1.1",
+                "symfony/process": "^5 || ^6 || ^7"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-main": "2.x-dev"
+                },
+                "plugin-modifies-install-path": true
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Dolibarr",
+                "Eliasis",
+                "Hurad",
+                "ImageCMS",
+                "Kanboard",
+                "Lan Management System",
+                "MODX Evo",
+                "MantisBT",
+                "Mautic",
+                "Maya",
+                "OXID",
+                "Plentymarkets",
+                "Porto",
+                "RadPHP",
+                "SMF",
+                "Starbug",
+                "Thelia",
+                "Whmcs",
+                "WolfCMS",
+                "agl",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "concreteCMS",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "eZ Platform",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "itop",
+                "known",
+                "kohana",
+                "laravel",
+                "lavalite",
+                "lithium",
+                "magento",
+                "majima",
+                "mako",
+                "matomo",
+                "mediawiki",
+                "miaoxing",
+                "modulework",
+                "modx",
+                "moodle",
+                "osclass",
+                "pantheon",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "processwire",
+                "puppet",
+                "pxcms",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "sydes",
+                "sylius",
+                "tastyigniter",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/installers/issues",
+                "source": "https://github.com/composer/installers/tree/v2.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-06-24T20:46:46+00:00"
+        },
         {
             "name": "johnbillion/extended-cpts",
             "version": "4.5.2",
@@ -738,6 +884,24 @@
             },
             "time": "2024-02-08T16:52:43+00:00"
         },
+        {
+            "name": "wpackagist-plugin/cmb2",
+            "version": "2.11.0",
+            "source": {
+                "type": "svn",
+                "url": "https://plugins.svn.wordpress.org/cmb2/",
+                "reference": "trunk"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://downloads.wordpress.org/plugin/cmb2.zip?timestamp=1712086610"
+            },
+            "require": {
+                "composer/installers": "^1.0 || ^2.0"
+            },
+            "type": "wordpress-plugin",
+            "homepage": "https://wordpress.org/plugins/cmb2/"
+        },
         {
             "name": "yahnis-elsts/plugin-update-checker",
             "version": "v5.4",
@@ -956,16 +1120,16 @@
         },
         {
             "name": "composer/semver",
-            "version": "3.4.0",
+            "version": "3.4.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32"
+                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32",
-                "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32",
+                "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6",
+                "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6",
                 "shasum": ""
             },
             "require": {
@@ -1017,7 +1181,7 @@
             "support": {
                 "irc": "ircs://irc.libera.chat:6697/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.4.0"
+                "source": "https://github.com/composer/semver/tree/3.4.2"
             },
             "funding": [
                 {
@@ -1033,7 +1197,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-08-31T09:50:34+00:00"
+            "time": "2024-07-12T11:35:52+00:00"
         },
         {
             "name": "composer/xdebug-handler",
@@ -2125,42 +2289,42 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "8.5.38",
+            "version": "8.5.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "1ecad678646c817a29e55a32c930f3601c3f5a8c"
+                "reference": "172ba97bcf97ae6ef86ca256adf77aece8a143fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1ecad678646c817a29e55a32c930f3601c3f5a8c",
-                "reference": "1ecad678646c817a29e55a32c930f3601c3f5a8c",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/172ba97bcf97ae6ef86ca256adf77aece8a143fe",
+                "reference": "172ba97bcf97ae6ef86ca256adf77aece8a143fe",
                 "shasum": ""
             },
             "require": {
-                "doctrine/instantiator": "^1.3.1",
+                "doctrine/instantiator": "^1.5.0",
                 "ext-dom": "*",
                 "ext-json": "*",
                 "ext-libxml": "*",
                 "ext-mbstring": "*",
                 "ext-xml": "*",
                 "ext-xmlwriter": "*",
-                "myclabs/deep-copy": "^1.10.0",
-                "phar-io/manifest": "^2.0.3",
-                "phar-io/version": "^3.0.2",
+                "myclabs/deep-copy": "^1.12.0",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
                 "php": ">=7.2",
-                "phpunit/php-code-coverage": "^7.0.12",
-                "phpunit/php-file-iterator": "^2.0.4",
+                "phpunit/php-code-coverage": "^7.0.17",
+                "phpunit/php-file-iterator": "^2.0.6",
                 "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.1.2",
+                "phpunit/php-timer": "^2.1.4",
                 "sebastian/comparator": "^3.0.5",
-                "sebastian/diff": "^3.0.2",
-                "sebastian/environment": "^4.2.3",
-                "sebastian/exporter": "^3.1.5",
-                "sebastian/global-state": "^3.0.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^2.0.1",
-                "sebastian/type": "^1.1.3",
+                "sebastian/diff": "^3.0.6",
+                "sebastian/environment": "^4.2.5",
+                "sebastian/exporter": "^3.1.6",
+                "sebastian/global-state": "^3.0.5",
+                "sebastian/object-enumerator": "^3.0.5",
+                "sebastian/resource-operations": "^2.0.3",
+                "sebastian/type": "^1.1.5",
                 "sebastian/version": "^2.0.1"
             },
             "suggest": {
@@ -2203,7 +2367,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.38"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.39"
             },
             "funding": [
                 {
@@ -2219,7 +2383,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-04-05T04:31:23+00:00"
+            "time": "2024-07-10T11:43:00+00:00"
         },
         {
             "name": "psr/cache",
diff --git a/deactivate.php b/includes/deactivate.php
similarity index 69%
rename from deactivate.php
rename to includes/deactivate.php
index d9b83e7..5424ca3 100644
--- a/deactivate.php
+++ b/includes/deactivate.php
@@ -1,7 +1,15 @@
 <?php
 
+/**
+ * Unschedule WP Cron Event(s)
+ */
 function deactivate(): void
 {
     $timestamp = wp_next_scheduled('owc_pdc_leges_update_cron');
+
+	if (! $timestamp) {
+		return;
+	}
+
     wp_unschedule_event($timestamp, 'owc_pdc_leges_update_cron');
 }
diff --git a/includes/dependency-check.php b/includes/dependency-check.php
new file mode 100644
index 0000000..f20697d
--- /dev/null
+++ b/includes/dependency-check.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace OWC\PDC\Leges\Includes;
+
+class DependencyCheck
+{
+    public static function checkDependencies(): bool
+    {
+		include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+
+        if (! is_plugin_active('pdc-base/pdc-base.php')) {
+            add_action('admin_notices', [self::showPluginDependencyNotice('OpenPDC Base (version >= 3.0.0)')]);
+
+            return false;
+        }
+
+        if (! is_plugin_active('cmb2/init.php')) {
+            add_action('admin_notices', [self::showPluginDependencyNotice('CMB2')]);
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private static function showPluginDependencyNotice(string $pluginName): void
+    {
+        $message = __(
+            __('The following plugins are required to use the PDC Leges:', 'pdc-leges'),
+            'pdc-leges'
+        );
+        $list = sprintf('<p>%s</p><ol><li>%s</li></ol>', $message, $pluginName);
+
+        printf('<div class="notice notice-error"><p>%s</p></div>', $list);
+    }
+}
diff --git a/languages/pdc-leges-nl_NL.mo b/languages/pdc-leges-nl_NL.mo
index 5e58216..f69b5fa 100644
Binary files a/languages/pdc-leges-nl_NL.mo and b/languages/pdc-leges-nl_NL.mo differ
diff --git a/languages/pdc-leges-nl_NL.po b/languages/pdc-leges-nl_NL.po
index 595ccb7..44d4df8 100644
--- a/languages/pdc-leges-nl_NL.po
+++ b/languages/pdc-leges-nl_NL.po
@@ -1,218 +1,160 @@
+# Copyright (C) 2024 Yard Internet
+# This file is distributed under the EUPL 1.2.
 msgid ""
 msgstr ""
-"Project-Id-Version: Config Expander\n"
-"POT-Creation-Date: 2022-10-21 16:15+0200\n"
-"PO-Revision-Date: 2022-10-21 16:15+0200\n"
-"Last-Translator: Edwin Siebel <edwin@yard.nl>\n"
-"Language-Team: Yard Internet <info@yard.nl>\n"
-"Language: nl_NL\n"
+"Project-Id-Version: PDC Leges 2.1.0\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/pdc-leges\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.1.1\n"
-"X-Poedit-KeywordsList: __;_e;_n:1,2;_x:1,2c;_ex:1,2c;_nx:4c,1,2;esc_attr__;"
-"esc_attr_e;esc_attr_x:1,2c;esc_html__;esc_html_e;esc_html_x:1,2c;"
-"_n_noop:1,2;_nx_noop:3c,1,2;__ngettext_noop:1,2\n"
-"X-Poedit-Basepath: ..\n"
-"X-Poedit-SearchPath-0: .\n"
-"X-Poedit-SearchPathExcluded-0: tests\n"
-"X-Poedit-SearchPathExcluded-1: docs\n"
-"X-Poedit-SearchPathExcluded-2: vendor\n"
-"X-Poedit-SearchPathExcluded-3: languages\n"
-
-#: pdc-leges.php:46
+"POT-Creation-Date: 2024-07-15T12:01:03+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.9.0\n"
+"X-Domain: pdc-leges\n"
+
+#. Plugin Name of the plugin
+#. Description of the plugin
+msgid "PDC Leges"
+msgstr "PDC Leges"
+
+#. Plugin URI of the plugin
+msgid "https://www.openwebconcept.nl"
+msgstr "https://www.openwebconcept.nl"
+
+#. Author of the plugin
+msgid "Yard Internet"
+msgstr "Yard Internet"
+
+#. Author URI of the plugin
+msgid "https://www.yardinternet.nl/"
+msgstr "https://www.yardinternet.nl/"
+
+#: includes/dependency-check.php:29
 msgid "The following plugins are required to use the PDC Leges:"
-msgstr ""
-"De PDC Leges plugin heeft de volgende plugins nodig om te functioneren:"
+msgstr "De PDC Leges plugin heeft de volgende plugins nodig om te functioneren:"
 
-#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:224
+#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:186
 msgid "New price"
 msgstr "Nieuw bedrag"
 
-#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:228
+#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:190
 msgid "Price"
 msgstr "Bedrag"
 
-#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:232
-#: src/Leges/Metabox/MetaboxServiceProvider.php:60
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:99
+#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:194
+#: src/Leges/Metabox/MetaboxServiceProvider.php:42
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:68
 msgid "Date new lege active"
 msgstr "Datum actief nieuwe lege"
 
-#: src/Leges/Metabox/MetaboxServiceProvider.php:40
+#: src/Leges/Metabox/MetaboxServiceProvider.php:20
 msgid "Lege settings"
 msgstr "Lege instellingen"
 
-#: src/Leges/Metabox/MetaboxServiceProvider.php:48
+#: src/Leges/Metabox/MetaboxServiceProvider.php:28
 msgid "Lege price"
 msgstr "Lege prijs"
 
-#: src/Leges/Metabox/MetaboxServiceProvider.php:49
-#: src/Leges/Metabox/MetaboxServiceProvider.php:55
+#: src/Leges/Metabox/MetaboxServiceProvider.php:29
+#: src/Leges/Metabox/MetaboxServiceProvider.php:36
 msgid "Price in &euro;"
 msgstr "Prijs in &euro;"
 
-#: src/Leges/Metabox/MetaboxServiceProvider.php:54
+#: src/Leges/Metabox/MetaboxServiceProvider.php:35
 msgid "Lege new price"
 msgstr "Lege nieuw bedrag"
 
-#: src/Leges/Metabox/MetaboxServiceProvider.php:63
+#: src/Leges/Metabox/MetaboxServiceProvider.php:47
 msgid "dd-mm-yy"
 msgstr "dd-mm-yy"
 
-#: src/Leges/Metabox/MetaboxServiceProvider.php:70
+#: src/Leges/Metabox/MetaboxServiceProvider.php:54
 msgid "(dd-mm-yy)"
 msgstr "(dd-mm-yy)"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:58
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:27
 msgctxt "post type general name"
 msgid "Leges"
 msgstr "Leges"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:59
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:28
 msgctxt "post type singular name"
 msgid "Lege"
 msgstr "Lege"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:60
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:29
 msgctxt "admin menu"
 msgid "Leges"
 msgstr "Leges"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:61
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:30
 msgctxt "add new on admin bar"
 msgid "Leges"
 msgstr "Leges"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:62
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:31
 msgctxt "lege"
 msgid "Add new lege"
 msgstr "Voeg nieuwe lege toe"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:63
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:32
 msgid "Add new lege"
 msgstr "Voeg nieuwe lege toe"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:64
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:33
 msgid "New lege"
 msgstr "Nieuwe lege"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:65
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:34
 msgid "Edit lege"
 msgstr "Bewerk lege"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:66
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:35
 msgid "View lege"
 msgstr "Bekijk lege"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:67
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:36
 msgid "All leges"
 msgstr "Alle leges"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:68
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:37
 msgid "Search leges"
 msgstr "Zoek leges"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:69
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:38
 msgid "Parent leges:"
-msgstr "Hoofd lege pagain:"
+msgstr "Bovenliggende leges:"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:70
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:39
 msgid "No leges found."
 msgstr "Geen leges gevonden."
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:71
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:40
 msgid "No leges found in Trash."
-msgstr "Geen leges gevonden in prullenbak."
+msgstr "Geen leges gevonden in de prullenbak."
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:76
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:45
 msgid "PDC leges"
 msgstr "PDC leges"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:91
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:60
 msgid "Lege price (in &euro;)"
 msgstr "Lege prijs (in &euro;)"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:95
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:64
 msgid "Lege new price (in &euro;)"
 msgstr "Nieuwe lege prijs (in &euro;)"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:104
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:73
 msgid "Lege shortcode"
 msgstr "Lege shortcode"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:110
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:79
 msgid "Published"
 msgstr "Gepubliceerd"
 
-#: src/Leges/PostType/LegesPostTypeServiceProvider.php:115
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:84
 msgid "Modified"
 msgstr "Aangepast"
-
-#~ msgctxt "post type general name"
-#~ msgid "PDC leges"
-#~ msgstr "PDC leges"
-
-#~ msgctxt "post type singular name"
-#~ msgid "PDC lege"
-#~ msgstr "PDC lege"
-
-#~ msgctxt "admin menu"
-#~ msgid "PDC leges"
-#~ msgstr "PDC leges"
-
-#~ msgctxt "add new on admin bar"
-#~ msgid "PDC leges"
-#~ msgstr "PDC leges"
-
-#~ msgctxt "lege"
-#~ msgid "Add new pdc lege"
-#~ msgstr "Voeg nieuwe PDC lege toe"
-
-#~ msgid "Add new pdc lege"
-#~ msgstr "Voeg nieuwe PDC lege toe"
-
-#~ msgid "New PDC lege"
-#~ msgstr "Nieuwe PDC lege"
-
-#~ msgid "Edit PDC lege"
-#~ msgstr "Bewerk PDC lege"
-
-#~ msgid "View PDC lege"
-#~ msgstr "Bekijk PDC lege"
-
-#~ msgid "All PDC leges"
-#~ msgstr "Alle PDC leges"
-
-#~ msgid "Search PDC leges"
-#~ msgstr "Zoek PDC leges"
-
-#~ msgid "Parent PDC leges:"
-#~ msgstr "Hoofd PDC lege:"
-
-#~ msgid "No PDC leges found."
-#~ msgstr "Geen PDC leges gevonden."
-
-#~ msgid "No PDC leges found in Trash."
-#~ msgstr "Geen PDC leges gevonden in prullenbak."
-
-#~ msgid "Add new pdc Lege"
-#~ msgstr "Voeg nieuwe PDC lege toe"
-
-#~ msgid "Add new Lege"
-#~ msgstr "Voeg nieuwe lege toe"
-
-#~ msgid "Edit Lege"
-#~ msgstr "Bewerk lege"
-
-#~ msgid "Leges"
-#~ msgstr "Leges"
-
-#~ msgctxt "add new on admin bar"
-#~ msgid "Lege"
-#~ msgstr "Lege"
-
-#~ msgid "This link does not work, go to our website: <a href=\"%s\">%s</a>"
-#~ msgstr "Deze link werkt niet, bekijk onze website: <a href=\"%s\">%s</a>"
diff --git a/languages/pdc-leges.pot b/languages/pdc-leges.pot
index 286dd75..b8b7620 100644
--- a/languages/pdc-leges.pot
+++ b/languages/pdc-leges.pot
@@ -1,150 +1,156 @@
-# Loco Gettext template
-#, fuzzy
+# Copyright (C) 2024 Yard Internet
+# This file is distributed under the EUPL 1.2.
 msgid ""
 msgstr ""
-"Project-Id-Version: PDC Leges\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-21 16:15+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: \n"
-"Language-Team: Yard Internet <inf@yard.nl>\n"
+"Project-Id-Version: PDC Leges 2.1.0\n"
+"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/pdc-leges\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION\n"
-"POT-Revision-Date: Fri Nov 27 2015 13:26:26 GMT+0100 (W. Europe Standard Time)\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: ../src\n"
-"X-Poedit-KeywordsList: _:1;gettext:1;dgettext:2;ngettext:1,2;dngettext:2,3;__:1;"
-"_e:1;_n:1,2;_n_noop:1,2;_nc:1,2;__ngettext:1,2;__ngettext_noop:1,2;_x:1,2c;"
-"_ex:1,2c;_nx:1,2,4c;_nx_noop:1,2,3c;_n_js:1,2;_nx_js:1,2,3c;esc_attr__:1;"
-"esc_html__:1;esc_attr_e:1;esc_html_e:1;esc_attr_x:1,2c;esc_html_x:1,2c\n"
-"X-Generator: Poedit 3.1.1\n"
-"X-Poedit-SearchPath-0: .\n"
-"X-Poedit-SearchPathExcluded-0: ../assets\n"
-"X-Poedit-SearchPathExcluded-1: ../node_modules\n"
-"X-Poedit-SearchPathExcluded-2: ../vendor\n"
-
-#: Leges/Admin/QuickEdit/QuickEditServiceProvider.php:224
+"POT-Creation-Date: 2024-07-15T12:01:03+00:00\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"X-Generator: WP-CLI 2.9.0\n"
+"X-Domain: pdc-leges\n"
+
+#. Plugin Name of the plugin
+#. Description of the plugin
+msgid "PDC Leges"
+msgstr ""
+
+#. Plugin URI of the plugin
+msgid "https://www.openwebconcept.nl"
+msgstr ""
+
+#. Author of the plugin
+msgid "Yard Internet"
+msgstr ""
+
+#. Author URI of the plugin
+msgid "https://www.yardinternet.nl/"
+msgstr ""
+
+#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:186
 msgid "New price"
 msgstr ""
 
-#: Leges/Admin/QuickEdit/QuickEditServiceProvider.php:228
+#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:190
 msgid "Price"
 msgstr ""
 
-#: Leges/Admin/QuickEdit/QuickEditServiceProvider.php:232
-#: Leges/Metabox/MetaboxServiceProvider.php:60
-#: Leges/PostType/LegesPostTypeServiceProvider.php:99
+#: src/Leges/Admin/QuickEdit/QuickEditServiceProvider.php:194
+#: src/Leges/Metabox/MetaboxServiceProvider.php:42
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:68
 msgid "Date new lege active"
 msgstr ""
 
-#: Leges/Metabox/MetaboxServiceProvider.php:40
+#: src/Leges/Metabox/MetaboxServiceProvider.php:20
 msgid "Lege settings"
 msgstr ""
 
-#: Leges/Metabox/MetaboxServiceProvider.php:48
+#: src/Leges/Metabox/MetaboxServiceProvider.php:28
 msgid "Lege price"
 msgstr ""
 
-#: Leges/Metabox/MetaboxServiceProvider.php:49
-#: Leges/Metabox/MetaboxServiceProvider.php:55
+#: src/Leges/Metabox/MetaboxServiceProvider.php:29
+#: src/Leges/Metabox/MetaboxServiceProvider.php:36
 msgid "Price in &euro;"
 msgstr ""
 
-#: Leges/Metabox/MetaboxServiceProvider.php:54
+#: src/Leges/Metabox/MetaboxServiceProvider.php:35
 msgid "Lege new price"
 msgstr ""
 
-#: Leges/Metabox/MetaboxServiceProvider.php:63
+#: src/Leges/Metabox/MetaboxServiceProvider.php:47
 msgid "dd-mm-yy"
 msgstr ""
 
-#: Leges/Metabox/MetaboxServiceProvider.php:70
+#: src/Leges/Metabox/MetaboxServiceProvider.php:54
 msgid "(dd-mm-yy)"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:58
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:27
 msgctxt "post type general name"
 msgid "Leges"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:59
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:28
 msgctxt "post type singular name"
 msgid "Lege"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:60
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:29
 msgctxt "admin menu"
 msgid "Leges"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:61
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:30
 msgctxt "add new on admin bar"
 msgid "Leges"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:62
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:31
 msgctxt "lege"
 msgid "Add new lege"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:63
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:32
 msgid "Add new lege"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:64
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:33
 msgid "New lege"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:65
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:34
 msgid "Edit lege"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:66
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:35
 msgid "View lege"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:67
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:36
 msgid "All leges"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:68
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:37
 msgid "Search leges"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:69
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:38
 msgid "Parent leges:"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:70
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:39
 msgid "No leges found."
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:71
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:40
 msgid "No leges found in Trash."
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:76
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:45
 msgid "PDC leges"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:91
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:60
 msgid "Lege price (in &euro;)"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:95
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:64
 msgid "Lege new price (in &euro;)"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:104
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:73
 msgid "Lege shortcode"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:110
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:79
 msgid "Published"
 msgstr ""
 
-#: Leges/PostType/LegesPostTypeServiceProvider.php:115
+#: src/Leges/PostType/LegesPostTypeServiceProvider.php:84
 msgid "Modified"
 msgstr ""
diff --git a/license.txt b/license.txt
deleted file mode 100644
index 94a0453..0000000
--- a/license.txt
+++ /dev/null
@@ -1,621 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  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
-them 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 prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  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.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey 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;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If 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 convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU 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 that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  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.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-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.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
diff --git a/pdc-leges.php b/pdc-leges.php
index 655df3b..093e544 100644
--- a/pdc-leges.php
+++ b/pdc-leges.php
@@ -4,17 +4,18 @@
  * Plugin Name:       PDC Leges
  * Plugin URI:        https://www.openwebconcept.nl
  * Description:       PDC Leges
- * Version:           2.0.0
- * Author:            Yard Internet
- * Author URI:        https://www.yardinternet.nl/
- * License:           GPL-3.0
- * License URI:       http://www.gnu.org/licenses/gpl-3.0.txt
+ * Version:           2.1.0
+ * Author:            Yard | Digital agency
+ * Author URI:        https://www.yard.nl/
+ * License:           EUPL-1.2
+ * License URI:       https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12
  * Text Domain:       pdc-leges
  * Domain Path:       /languages
  */
 
 use OWC\PDC\Leges\Autoloader;
 use OWC\PDC\Leges\Foundation\Plugin;
+use OWC\PDC\Leges\Includes\DependencyCheck;
 
 /**
  * If this file is called directly, abort.
@@ -23,15 +24,21 @@
     die;
 }
 
+require_once plugin_dir_path(__FILE__) . 'includes/dependency-check.php';
+require_once plugin_dir_path(__FILE__) . 'includes/deactivate.php'; // Function is used in register_deactivation_hook.
+
 /**
- * Manual loaded file: the autoloader.
+ * Autoload files using Composer autoload or fallback to custom autoloader.
  */
-if (file_exists(__DIR__ . '/vendor/autoload.php')) {
-    require_once __DIR__ . '/vendor/autoload.php';
+if (file_exists(plugin_dir_path(__FILE__) . 'vendor/autoload.php')) {
+    require_once plugin_dir_path(__FILE__) . 'vendor/autoload.php';
 } else {
-    require_once __DIR__ . '/autoloader.php';
-    $autoloader = new Autoloader();
+    require_once plugin_dir_path(__FILE__) . 'autoloader.php';
+	if (class_exists('OWC\PDC\Leges\Autoloader')) {
+    	$autoloader = new Autoloader();
+	}
 }
+
 /**
  * Begin execution of the plugin
  *
@@ -40,23 +47,17 @@
  * and wp_loaded action hooks.
  */
 add_action('plugins_loaded', function () {
-    if (! class_exists('OWC\PDC\Base\Foundation\Plugin')) {
-        add_action('admin_notices', function () {
-            $list = '<p>' . __(
-                'The following plugins are required to use the PDC Leges:',
-                'pdc-leges'
-            ) . '</p><ol><li>OpenPDC Base (version >= 3.0.0)</li></ol>';
-
-            printf('<div class="notice notice-error"><p>%s</p></div>', $list);
-        });
+    $plugin = (new Plugin(__DIR__))->boot();
 
-        \deactivate_plugins(\plugin_basename(__FILE__));
+	// The plugin must be activated before the translations can be loaded.
+	if (! DependencyCheck::checkDependencies()) {
+		deactivate_plugins(plugin_basename(__FILE__));
 
         return;
     }
-
-    $plugin = (new Plugin(__DIR__))->boot();
 }, 10);
 
-include_once plugin_dir_path(__FILE__) . 'deactivate.php';
+/**
+ * Deactivation.
+ */
 register_deactivation_hook(__FILE__, 'deactivate');
diff --git a/src/Leges/Foundation/Plugin.php b/src/Leges/Foundation/Plugin.php
index e77492e..9a64a08 100644
--- a/src/Leges/Foundation/Plugin.php
+++ b/src/Leges/Foundation/Plugin.php
@@ -23,7 +23,7 @@ class Plugin extends BasePlugin
      * Version of the plugin.
      * Used for setting versions of enqueue scripts and styles.
      */
-    const VERSION = '2.0.0';
+    const VERSION = '2.1.0';
 
     protected function checkForUpdate()
     {
diff --git a/src/Leges/Metabox/MetaboxServiceProvider.php b/src/Leges/Metabox/MetaboxServiceProvider.php
index 35d696b..2eba2e2 100644
--- a/src/Leges/Metabox/MetaboxServiceProvider.php
+++ b/src/Leges/Metabox/MetaboxServiceProvider.php
@@ -8,51 +8,50 @@ class MetaboxServiceProvider extends ServiceProvider
 {
     public function register(): void
     {
-        $this->plugin->loader->addFilter('rwmb_meta_boxes', $this, 'registerMetaboxes', 10, 1);
+        add_filter('cmb2_admin_init', [$this, 'registerMetaboxes'], 10, 0);
     }
 
-    public function registerMetaboxes(array $metaboxes): array
+    public function registerMetaboxes(): void
     {
-
         $prefix = '_pdc-lege';
 
-        $metaboxes[] = [
-            'id' => 'pdc-leges',
-            'title' => __('Lege settings', 'pdc-leges'),
-            'post_types' => ['pdc-leges'],
-            'context' => 'normal',
-            'priority' => 'high',
-            'autosave' => true,
-            'fields' => [
-                [
-                    'id' => "{$prefix}-price",
-                    'name' => __('Lege price', 'pdc-leges'),
-                    'desc' => __('Price in &euro;', 'pdc-leges'),
-                    'type' => 'text',
-                ],
-                [
-                    'id' => "{$prefix}-new-price",
-                    'name' => __('Lege new price', 'pdc-leges'),
-                    'desc' => __('Price in &euro;', 'pdc-leges'),
-                    'type' => 'text',
-                ],
-                [
-                    'id' => "{$prefix}-active-date",
-                    'name' => esc_html__('Date new lege active', 'pdc-leges'),
-                    'type' => 'date',
-                    'js_options' => [
-                        'dateFormat' => esc_html__('dd-mm-yy', 'pdc-leges'),
-                        'altFormat' => 'yy-mm-dd',
-                        'changeMonth' => true,
-                        'changeYear' => true,
-                        'showButtonPanel' => true,
-                        'minDate' => 0,
-                    ],
-                    'desc' => esc_html__('(dd-mm-yy)', 'pdc-leges'),
-                ],
-            ],
-        ];
+        $cmb = new_cmb2_box([
+            'id'            => 'pdc_leges',
+            'title'         => __('Lege settings', 'pdc-leges'),
+            'object_types'  => ['pdc-leges'],
+            'context'       => 'normal',
+            'priority'      => 'high',
+            'show_names'    => true
+        ]);
+
+        $cmb->add_field([
+            'name' => __('Lege price', 'pdc-leges'),
+            'desc' => __('Price in &euro;', 'pdc-leges'),
+            'id'   => "{$prefix}-price",
+            'type' => 'text',
+        ]);
 
-        return $metaboxes;
+        $cmb->add_field([
+            'name' => __('Lege new price', 'pdc-leges'),
+            'desc' => __('Price in &euro;', 'pdc-leges'),
+            'id'   => "{$prefix}-new-price",
+            'type' => 'text',
+        ]);
+
+        $cmb->add_field([
+            'name'       => esc_html__('Date new lege active', 'pdc-leges'),
+            'id'         => "{$prefix}-active-date",
+            'type'       => 'text_date',
+            'date_format' => 'd-m-Y',
+            'attributes' => [
+                'data-date-format' => esc_html__('dd-mm-yy', 'pdc-leges'),
+                'data-alt-format' => 'yy-mm-dd',
+                'data-change-month' => true,
+                'data-change-year' => true,
+                'data-show-button-panel' => true,
+                'data-min-date' => 0,
+            ],
+            'desc' => esc_html__('(dd-mm-yy)', 'pdc-leges'),
+        ]);
     }
 }