diff --git a/.php_cs b/.php-cs-fixer.php
similarity index 97%
rename from .php_cs
rename to .php-cs-fixer.php
index 545972f..dfbb35e 100644
--- a/.php_cs
+++ b/.php-cs-fixer.php
@@ -60,7 +60,6 @@
   'no_binary_string'                    => true,
   'no_empty_phpdoc'                     => true,
   'no_null_property_initialization'     => true,
-  'no_short_echo_tag'                   => true,
   'no_superfluous_elseif'               => true,
   'no_unneeded_curly_braces'            => true,
   'no_useless_else'                     => true,
@@ -68,7 +67,6 @@
   'ordered_class_elements'              => true,
   'ordered_imports'                     => true,
   'php_unit_internal_class'             => true,
-  'php_unit_ordered_covers'             => true,
   'php_unit_test_class_requires_covers' => true,
   'phpdoc_add_missing_param_annotation' => true,
   'phpdoc_order'                        => true,
@@ -110,7 +108,7 @@
   ->ignoreDotFiles(true)
   ->ignoreVCS(true);
 
-return \PhpCsFixer\Config::create()
+return (new \PhpCsFixer\Config())
   ->setFinder($finder)
   ->setRules($rules)
   ->setIndent('  ')
diff --git a/README.txt b/README.txt
index c3f425c..ba3dfb6 100755
--- a/README.txt
+++ b/README.txt
@@ -22,7 +22,7 @@ This plugin incorporates tips used a lot by experienced web experts, as well as
 Rate [5 stars (⭐️⭐️⭐️⭐️⭐️)](https://wordpress.org/support/plugin/shins-pageload-magic/reviews/?filter=5#new-post) if you guys like it.
 
 
-### Good points
+### What people loves
 
 - ⚡️ Native API, blazing fast
 - 👍 Legacy browsers support (IE9+)
@@ -163,6 +163,8 @@ We recommend you use it with another page-caching plugin for best performance.
 
 == Changelog ==
 
+2.4 Small updates and documentations
+
 2.3 Bug fixes and improvements
 
 2.2 Code improvements
diff --git a/VERSION b/VERSION
index 9183195..58073ef 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.0
\ No newline at end of file
+2.4.1
\ No newline at end of file
diff --git a/admin/partials/defer-wordpress-admin-display.php b/admin/partials/defer-wordpress-admin-display.php
index 09bb69d..e6d1e24 100644
--- a/admin/partials/defer-wordpress-admin-display.php
+++ b/admin/partials/defer-wordpress-admin-display.php
@@ -39,7 +39,8 @@
             <div id="message" class="<?php echo $err; ?> fade">
                 <p><strong><?php echo esc_html($msg); ?></strong></p>
             </div>
-        <?php } ?>
+        <?php
+} ?>
 
         <?php if (!isset($reset_settings) && !isset($save_settings)) { ?>
             <div id="message" class="notice notice-info fade">
diff --git a/composer.json b/composer.json
index f5850d8..ea8fda7 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
         }
     ],
     "scripts": {
-        "fixer": "php-cs-fixer fix --show-progress=estimating --verbose --ansi",
+        "fixer": "php-cs-fixer fix --show-progress=dots --verbose --ansi",
         "pull": [
             "rm -rf ./cache/*/ ./vendor/ ./node_modules/ ./composer.lock ./package-lock.json",
             "composer clearcache --ansi",
@@ -54,7 +54,7 @@
     },
     "require": {
         "php": ">=5.6",
-        "shinsenter/defer.php": "^2.3",
+        "shinsenter/defer.php": "^2.4",
         "symfony/polyfill-mbstring": "<=1.22.0",
         "dangoodman/composer-for-wordpress": "^2.0"
     },
diff --git a/composer.lock b/composer.lock
index 7539ee6..d0e39ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "b8a09c692b07e908814329cc1a7b95cf",
+    "content-hash": "533aa1df966daa36b5b82c1b3b63753d",
     "packages": [
         {
             "name": "dangoodman/composer-for-wordpress",
@@ -152,16 +152,16 @@
         },
         {
             "name": "shinsenter/defer.php",
-            "version": "2.4.0",
+            "version": "2.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/shinsenter/defer.php.git",
-                "reference": "b097d3630e0f5ddf2639b4deabb2ddd2ae2cec7e"
+                "reference": "f95a852a12b541ecb9f75c354c82eb966b174464"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/shinsenter/defer.php/zipball/b097d3630e0f5ddf2639b4deabb2ddd2ae2cec7e",
-                "reference": "b097d3630e0f5ddf2639b4deabb2ddd2ae2cec7e",
+                "url": "https://api.github.com/repos/shinsenter/defer.php/zipball/f95a852a12b541ecb9f75c354c82eb966b174464",
+                "reference": "f95a852a12b541ecb9f75c354c82eb966b174464",
                 "shasum": ""
             },
             "require": {
@@ -244,7 +244,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2021-04-16T12:31:44+00:00"
+            "time": "2021-05-21T03:02:10+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -461,16 +461,16 @@
     "packages-dev": [
         {
             "name": "composer/semver",
-            "version": "3.2.4",
+            "version": "3.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/semver.git",
-                "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464"
+                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/a02fdf930a3c1c3ed3a49b5f63859c0c20e10464",
-                "reference": "a02fdf930a3c1c3ed3a49b5f63859c0c20e10464",
+                "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9",
+                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9",
                 "shasum": ""
             },
             "require": {
@@ -522,7 +522,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/semver/issues",
-                "source": "https://github.com/composer/semver/tree/3.2.4"
+                "source": "https://github.com/composer/semver/tree/3.2.5"
             },
             "funding": [
                 {
@@ -538,20 +538,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-11-13T08:59:24+00:00"
+            "time": "2021-05-24T12:41:47+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.6",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "f27e06cd9675801df441b3656569b328e04aa37c"
+                "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/f27e06cd9675801df441b3656569b328e04aa37c",
-                "reference": "f27e06cd9675801df441b3656569b328e04aa37c",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/964adcdd3a28bf9ed5d9ac6450064e0d71ed7496",
+                "reference": "964adcdd3a28bf9ed5d9ac6450064e0d71ed7496",
                 "shasum": ""
             },
             "require": {
@@ -586,7 +586,7 @@
             "support": {
                 "irc": "irc://irc.freenode.org/composer",
                 "issues": "https://github.com/composer/xdebug-handler/issues",
-                "source": "https://github.com/composer/xdebug-handler/tree/1.4.6"
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.1"
             },
             "funding": [
                 {
@@ -602,7 +602,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-25T17:01:18+00:00"
+            "time": "2021-05-05T19:37:51+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -742,21 +742,21 @@
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.18.5",
+            "version": "v2.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf"
+                "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/e0f6d05c8b157f50029ca6c65c19ed2694f475bf",
-                "reference": "e0f6d05c8b157f50029ca6c65c19ed2694f475bf",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d5b8a9d852b292c2f8a035200fa6844b1f82300b",
+                "reference": "d5b8a9d852b292c2f8a035200fa6844b1f82300b",
                 "shasum": ""
             },
             "require": {
                 "composer/semver": "^1.4 || ^2.0 || ^3.0",
-                "composer/xdebug-handler": "^1.2",
+                "composer/xdebug-handler": "^1.2 || ^2.0",
                 "doctrine/annotations": "^1.2",
                 "ext-json": "*",
                 "ext-tokenizer": "*",
@@ -799,6 +799,11 @@
                 "php-cs-fixer"
             ],
             "type": "application",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.19-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "PhpCsFixer\\": "src/"
@@ -834,7 +839,7 @@
             "description": "A tool to automatically fix PHP code style",
             "support": {
                 "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
-                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.18.5"
+                "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.0"
             },
             "funding": [
                 {
@@ -842,20 +847,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-04-06T18:37:33+00:00"
+            "time": "2021-05-03T21:43:24+00:00"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.19",
+            "version": "v2.0.20",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241"
+                "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/446fc9faa5c2a9ddf65eb7121c0af7e857295241",
-                "reference": "446fc9faa5c2a9ddf65eb7121c0af7e857295241",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
+                "reference": "0f1f60250fccffeaf5dda91eea1c018aed1adc2a",
                 "shasum": ""
             },
             "require": {
@@ -896,7 +901,7 @@
                 "issues": "https://github.com/paragonie/random_compat/issues",
                 "source": "https://github.com/paragonie/random_compat"
             },
-            "time": "2020-10-15T10:06:57+00:00"
+            "time": "2021-04-17T09:33:01+00:00"
         },
         {
             "name": "php-cs-fixer/diff",
@@ -955,16 +960,16 @@
         },
         {
             "name": "psr/log",
-            "version": "1.1.3",
+            "version": "1.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
+                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
                 "shasum": ""
             },
             "require": {
@@ -988,7 +993,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
+                    "homepage": "https://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -999,9 +1004,9 @@
                 "psr-3"
             ],
             "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
             },
-            "time": "2020-03-23T09:12:05+00:00"
+            "time": "2021-05-03T11:20:27+00:00"
         },
         {
             "name": "symfony/console",
diff --git a/defer-wordpress.php b/defer-wordpress.php
index 2ded282..42b7724 100644
--- a/defer-wordpress.php
+++ b/defer-wordpress.php
@@ -28,7 +28,7 @@
  * Plugin Name:       A faster website! (aka defer.js)
  * Plugin URI:        https://wordpress.org/plugins/shins-pageload-magic/
  * Description:       💯 Latest web technologies in website optimization by experienced web experts. 🔰 Very easy to use.
- * Version:           2.4.0
+ * Version:           2.4.1
  * Author:            Mai Nhut Tan
  * Author URI:        https://code.shin.company/
  * License:           GPL-2.0+
@@ -44,7 +44,7 @@
 if (!defined('DEFER_WP_PLUGIN_VERSION')) {
   define('DEFER_WP_PLUGIN_BASE', plugin_basename(__FILE__));
   define('DEFER_WP_PLUGIN_NAME', 'defer-wordpress');
-  define('DEFER_WP_PLUGIN_VERSION', '2.4.0');
+  define('DEFER_WP_PLUGIN_VERSION', '2.4.1');
   define('DEFER_WP_PLUGIN_PREFIX', DEFER_WP_PLUGIN_NAME . '_');
 
   define('DEFER_WP_PLUGIN_HOOK', 'plugin_action_links_' . DEFER_WP_PLUGIN_BASE);
@@ -58,7 +58,7 @@
   $has_deferjs = file_exists(__DIR__ . '/public/lib/defer_plus.min.js');
   define('DEFER_WP_SRC_DEFERJS_CDN', $has_deferjs
         ? __DIR__ . '/public/lib/defer_plus.min.js'
-        : 'https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.4.0/dist/defer_plus.min.js');
+        : 'https://cdn.jsdelivr.net/npm/@shinsenter/defer.js@2.4.2/dist/defer_plus.min.js');
 
   $has_polyfill = file_exists(__DIR__ . '/public/lib/polyfill.min.js');
   define('DEFER_WP_SRC_POLYFILL_CDN', $has_polyfill
diff --git a/package-lock.json b/package-lock.json
index a6fab39..2d9a54d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,13 +7,13 @@
             "name": "shinsenter/defer-wordpress",
             "license": "GPL-2.0",
             "dependencies": {
-                "@shinsenter/defer.js": "^2.4.1"
+                "@shinsenter/defer.js": "^2.4.2"
             }
         },
         "node_modules/@shinsenter/defer.js": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/@shinsenter/defer.js/-/defer.js-2.4.1.tgz",
-            "integrity": "sha512-/WFC4OI+kCUqEaSy3PuFCFsWe0TdcAWWx4eztptpqaGENZHViOvJyqnN7fEoL3ZNLxDQWQPadZNXlUUNdnioyw==",
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/@shinsenter/defer.js/-/defer.js-2.4.2.tgz",
+            "integrity": "sha512-hZkySx293V5zqZb1aEc4ARm3v2ONj3ufPtmZRJzZMzmTNfmpdcVjfcBqgm09vf5ja1lH1NOLE5zxYF4KIwn7yQ==",
             "funding": [
                 {
                     "type": "github",
@@ -32,9 +32,9 @@
     },
     "dependencies": {
         "@shinsenter/defer.js": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/@shinsenter/defer.js/-/defer.js-2.4.1.tgz",
-            "integrity": "sha512-/WFC4OI+kCUqEaSy3PuFCFsWe0TdcAWWx4eztptpqaGENZHViOvJyqnN7fEoL3ZNLxDQWQPadZNXlUUNdnioyw=="
+            "version": "2.4.2",
+            "resolved": "https://registry.npmjs.org/@shinsenter/defer.js/-/defer.js-2.4.2.tgz",
+            "integrity": "sha512-hZkySx293V5zqZb1aEc4ARm3v2ONj3ufPtmZRJzZMzmTNfmpdcVjfcBqgm09vf5ja1lH1NOLE5zxYF4KIwn7yQ=="
         }
     }
 }
diff --git a/package.json b/package.json
index f464493..026a31d 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
     "author": "Mai Nhut Tan <shin@shin.company>",
     "license": "GPL-2.0",
     "dependencies": {
-        "@shinsenter/defer.js": "^2.4.1"
+        "@shinsenter/defer.js": "^2.4.2"
     },
     "repository": {
         "type": "git",