diff --git a/composer.json b/composer.json
index 4ccb424..7d414c8 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "by/guest-entries-notification",
     "description": "A plugin to get notification when an entry is created.",
     "type": "craft-plugin",
-    "version": "1.0.2",
+    "version": "2.0.0",
     "keywords": [
         "craft",
         "cms",
@@ -22,8 +22,8 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.0.0",
-        "craftcms/guest-entries": "^2.1.3"
+        "craftcms/cms": "^4.0.0",
+        "craftcms/guest-entries": "^3.0.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/GuestEntriesNotification.php b/src/GuestEntriesNotification.php
index 3d051b2..68fb639 100644
--- a/src/GuestEntriesNotification.php
+++ b/src/GuestEntriesNotification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Guest Entries Notification plugin for Craft CMS 3.x
+ * Guest Entries Notification plugin for Craft CMS 4.x
  *
  * A plugin to get notification when an entry is created.
  *
@@ -14,6 +14,7 @@
 use by\guestentriesnotification\models\Settings;
 
 use Craft;
+use craft\base\Model;
 use craft\base\Plugin;
 use craft\services\Plugins;
 use craft\events\PluginEvent;
@@ -28,7 +29,7 @@
  *
  * @author    Bhashkar Yadav
  * @package   GuestEntriesNotification
- * @since     1.0.0
+ * @since     2.0.0
  *
  * @property  GuestEntriesNotificationServiceService $guestEntriesNotificationService
  */
@@ -48,7 +49,7 @@ class GuestEntriesNotification extends Plugin
     /**
      * @var string
      */
-    public $schemaVersion = '1.0.0';
+    public string $schemaVersion = '2.0.0';
 
     // Public Methods
     // =========================================================================
@@ -97,7 +98,7 @@ function (PluginEvent $event) {
     /**
      * @inheritdoc
      */
-    protected function createSettingsModel()
+    protected function createSettingsModel(): ?Model
     {
         return new Settings();
     }
diff --git a/src/assetbundles/GuestEntriesNotification/GuestEntriesNotificationAsset.php b/src/assetbundles/GuestEntriesNotification/GuestEntriesNotificationAsset.php
index 3c88013..0423610 100644
--- a/src/assetbundles/GuestEntriesNotification/GuestEntriesNotificationAsset.php
+++ b/src/assetbundles/GuestEntriesNotification/GuestEntriesNotificationAsset.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Guest Entries Notification plugin for Craft CMS 3.x
+ * Guest Entries Notification plugin for Craft CMS 4.x
  *
  * A plugin to get notification when an entry is created.
  *
@@ -17,7 +17,7 @@
 /**
  * @author    Bhashkar Yadav
  * @package   GuestEntriesNotification
- * @since     1.0.0
+ * @since     2.0.0
  */
 class GuestEntriesNotificationAsset extends AssetBundle
 {
diff --git a/src/config.php b/src/config.php
index 60bdd78..ca805ca 100644
--- a/src/config.php
+++ b/src/config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Guest Entries Notification plugin for Craft CMS 3.x
+ * Guest Entries Notification plugin for Craft CMS 4.x
  *
  * A plugin to get notification when an entry is created.
  *
diff --git a/src/models/Settings.php b/src/models/Settings.php
index 8c3a042..b7b1b93 100644
--- a/src/models/Settings.php
+++ b/src/models/Settings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Guest Entries Notification plugin for Craft CMS 3.x
+ * Guest Entries Notification plugin for Craft CMS 4.x
  *
  * A plugin to get notification when an entry is created.
  *
@@ -18,7 +18,7 @@
 /**
  * @author    Bhashkar Yadav
  * @package   GuestEntriesNotification
- * @since     1.0.0
+ * @since     2.0.0
  */
 class Settings extends Model
 {
@@ -40,7 +40,7 @@ class Settings extends Model
     /**
      * @inheritdoc
      */
-    public function rules()
+    public function rules(): array
     {
         return [
             ['confirmationTemplate', 'string'],
diff --git a/src/services/GuestEntriesNotificationService.php b/src/services/GuestEntriesNotificationService.php
index c78ca0a..d04df17 100644
--- a/src/services/GuestEntriesNotificationService.php
+++ b/src/services/GuestEntriesNotificationService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Guest Entries Notification plugin for Craft CMS 3.x
+ * Guest Entries Notification plugin for Craft CMS 4.x
  *
  * A plugin to get notification when an entry is created.
  *
@@ -21,7 +21,7 @@
 /**
  * @author    Bhashkar Yadav
  * @package   GuestEntriesNotification
- * @since     1.0.0
+ * @since     2.0.0
  */
 class GuestEntriesNotificationService extends Component
 {
@@ -33,7 +33,8 @@ class GuestEntriesNotificationService extends Component
      */
     public function sendNotification($entry)
     {
-        $settings = Craft::$app->systemSettings->getSettings('email');
+        $prohectConfig = Craft::$app->getProjectConfig();
+        $settings = $prohectConfig->get('email');
         $pluginSettings = GuestEntriesNotification::$plugin->getSettings();
         
         if(isset($pluginSettings->emailTo) and !empty($pluginSettings->emailTo)){
diff --git a/src/templates/settings.twig b/src/templates/settings.twig
index 115f3e8..e3cb72f 100644
--- a/src/templates/settings.twig
+++ b/src/templates/settings.twig
@@ -1,7 +1,7 @@
 {# @var craft \craft\web\twig\variables\CraftVariable #}
 {#
 /**
- * Guest Entries Notification plugin for Craft CMS 3.x
+ * Guest Entries Notification plugin for Craft CMS 4.x
  *
  * Guest Entries Notification Settings.twig
  *
@@ -9,22 +9,22 @@
  * @copyright Copyright (c) 2018 Bhashkar Yadav
  * @link      https://360adaptive.com
  * @package   GuestEntriesNotification
- * @since     1.0.0
+ * @since     2.0.0
  */
 #}
 
 {% import "_includes/forms" as forms %}
 
-{% set systemSettings = craft.systemSettings.email %}
-
-{% set defaultEmail = systemSettings.fromEmail %}
+{% set prohectConfig = craft.app.getProjectConfig() %}
+{% set emailSettings = prohectConfig.get('email') %}
 
 {{ forms.textField({
     label: 'From Email',
     instructions: 'Enter the Email that will send the Notification Emails.',
     id: 'fromEmail',
     name: 'fromEmail',
-    value: settings['fromEmail']})
+    value: settings['fromEmail'] ? settings['fromEmail'] : emailSettings.fromEmail
+    })
 }}
 
 {{ forms.textField({
@@ -32,7 +32,7 @@
     instructions: 'Enter the Name that will send the Notification Emails.',
     id: 'fromName',
     name: 'fromName',
-    value: settings['fromName']})
+    value: settings['fromName'] ? settings['fromName'] : emailSettings.fromEmail})
 }}
 
 {{ forms.textField({
diff --git a/src/translations/en/guest-entries-notification.php b/src/translations/en/guest-entries-notification.php
index 44b7c4a..3dc9a10 100644
--- a/src/translations/en/guest-entries-notification.php
+++ b/src/translations/en/guest-entries-notification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Guest Entries Notification plugin for Craft CMS 3.x
+ * Guest Entries Notification plugin for Craft CMS 4.x
  *
  * A plugin to get notification when an entry is created.
  *
@@ -11,7 +11,7 @@
 /**
  * @author    Bhashkar Yadav
  * @package   GuestEntriesNotification
- * @since     1.0.0
+ * @since     2.0.0
  */
 return [
     'Guest Entries Notification plugin loaded' => 'Guest Entries Notification plugin loaded',