diff --git a/Block/Adminhtml/System/Config/Form/InfoBlogExtra.php b/Block/Adminhtml/System/Config/Form/InfoBlogExtra.php
new file mode 100644
index 00000000..9242fe54
--- /dev/null
+++ b/Block/Adminhtml/System/Config/Form/InfoBlogExtra.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+declare(strict_types=1);
+
+namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
+
+class InfoBlogExtra extends InfoPlan
+{
+
+    /**
+     * @return string
+     */
+    protected function getMinPlan(): string
+    {
+        return 'Extra';
+    }
+
+    /**
+     * @return string
+     */
+    protected function getSectionId(): string
+    {
+        $sections = json_encode([
+            'mfblog_post_view_category_posts',
+            'mfblog_post_view_comments_enabled',
+            'mfblog_post_view_comments_admin_enable_comment_notification',
+            'mfblog_post_view_comments_email_template',
+            'mfblog_post_view_comments_sender_form',
+            'mfblog_post_view_comments_admin_send_from',
+            'mfblog_post_view_comments_admin_send_to',
+            'mfblog_post_view_comments_admin_email_template',
+            'mfblog_blog_search',
+            'mfblog_sidebar_contents'
+        ]);
+        return $sections;
+    }
+    protected function getText(): string
+    {
+        return 'This option is available in <strong>Extra</strong> plan only.';
+
+    }
+}
diff --git a/Block/Adminhtml/System/Config/Form/InfoBlogPlus.php b/Block/Adminhtml/System/Config/Form/InfoBlogPlus.php
new file mode 100644
index 00000000..0113a27e
--- /dev/null
+++ b/Block/Adminhtml/System/Config/Form/InfoBlogPlus.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+declare(strict_types=1);
+
+namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
+
+class InfoBlogPlus extends InfoPlan
+{
+
+    /**
+     * @return string
+     */
+    protected function getMinPlan(): string
+    {
+        return 'Plus';
+    }
+
+    /**
+     * @return string
+     */
+    protected function getSectionId(): string
+    {
+        $sections = json_encode([
+            'mfblog_post_view_related_posts_autorelated_enabled',
+            'mfblog_post_view_related_products_autorelated_enabled',
+            'mfblog_post_view_comments_format_date',
+            'mfblog_sidebar_archive_format_date',
+            'mfblog_post_view_related_products_autorelated_black_words',
+            'mfblog_post_view_related_posts_autorelated_black_words',
+            'mfblog_design',
+            'mfblog_advanced_permalink',
+            'mfblog_sitemap'
+        ]);
+        return $sections;
+    }
+    protected function getText(): string
+    {
+        return 'Google Ads options are available in <strong>Plus or Extra</strong> plans only.';
+    }
+}
diff --git a/Block/Adminhtml/System/Config/Form/InfoPlan.php b/Block/Adminhtml/System/Config/Form/InfoPlan.php
new file mode 100644
index 00000000..3466366a
--- /dev/null
+++ b/Block/Adminhtml/System/Config/Form/InfoPlan.php
@@ -0,0 +1,93 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+declare(strict_types=1);
+
+namespace Magefan\Blog\Block\Adminhtml\System\Config\Form;
+
+abstract class InfoPlan extends \Magefan\Community\Block\Adminhtml\System\Config\Form\Info
+{
+    /**
+     * @return string
+     */
+    abstract protected function getMinPlan(): string;
+
+    /**
+     * @return string
+     */
+    abstract protected function getSectionId(): string;
+
+    /**
+     * @return string
+     */
+    abstract protected function getText(): string;
+
+
+    /**
+     * Return info block html
+     * @param  \Magento\Framework\Data\Form\Element\AbstractElement $element
+     * @return string
+     */
+    public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
+    {
+        if ($this->getModuleVersion->execute($this->getModuleName() . $this->getMinPlan())) {
+            return '';
+        }
+
+        $html = '';
+
+        $html .= '<script>
+                    require(["jquery", "Magento_Ui/js/modal/alert", "domReady!"], function($, alert){
+                        setInterval(function(){
+                            var json = ' . $this->getSectionId() . ';
+                            json.forEach(function(element) {
+                                var $section = $("#" + element + "-state").parent(".section-config");
+                                var $formatDateField = $("#" + element);
+
+                                function disableField($field) {
+                                    $field.attr("readonly", "readonly");
+                                    $field.removeAttr("disabled");
+                                    if ($field.data("mbdisabled")) return;
+                                    $field.data("mbdisabled", 1);
+                                    $field.click(function(){
+                                        alert({
+                                            title: "You can not change this option.",
+                                            content: "' . ($this->getMinPlan() == "Extra" ? 'This option is available in <strong>Extra</strong> plan only.' : 'This option is available in <strong>Plus or Extra</strong> plans only.') . '",
+                                            buttons: [{
+                                                text: "Upgrade Plan Now",
+                                                class: "action primary accept",
+                                                click: function () {
+                                                    window.open("https://magefan.com/magento2-blog-extension/pricing?utm_source=gtm_config&utm_medium=link&utm_campaign=regular");
+                                                }
+                                            }]
+                                        });
+                                    });
+                                }
+
+                                if ($section.length) {
+                                    $section.find(".use-default").css("visibility", "hidden");
+                                    $section.find("input,select").each(function(){
+                                        disableField($(this));
+                                    });
+                                    if ($section.data("mbdisabled")) return;
+                                    $section.data("mbdisabled", 1);
+                                    var customHtml = \'<div style="padding:10px;background-color:#f8f8f8;border:1px solid #ddd;margin-bottom:7px;">' . $this->getText() . ' <a style="color: #ef672f; text-decoration: underline;" href="https://magefan.com/magento2-blog-extension/pricing?utm_source=gtm_config&utm_medium=link&utm_campaign=regular" target="_blank">Read more</a>.</div>\';
+                                    console.log($section.find([id$="state"]).parent(".section-config"));
+                                    $($section.find("fieldset")).prepend(customHtml);
+
+                                } else {
+                                    $("#row_" + element).find(".use-default").css("visibility", "hidden");
+                                    disableField($formatDateField);
+                                }
+                            });
+
+                        }, 1000);
+                    });
+                </script>';
+
+        return $html;
+    }
+}
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 46a4ac3b..49a6481a 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -21,6 +21,12 @@
                 <field id="version" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <frontend_model>Magefan\Blog\Block\Adminhtml\System\Config\Form\Info</frontend_model>
                 </field>
+                <field id="infoPlus" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <frontend_model>Magefan\Blog\Block\Adminhtml\System\Config\Form\InfoBlogPlus</frontend_model>
+                </field>
+                <field id="infoExtra" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <frontend_model>Magefan\Blog\Block\Adminhtml\System\Config\Form\InfoBlogExtra</frontend_model>
+                </field>
                 <field id="enabled" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Enable Extension</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -83,6 +89,26 @@
                     </field>
                 </group>
 
+                <group id="category_posts" translate="label" type="text" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Posts From The Same Category (BlogExtra)</label>
+                    <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Display Posts From The Same Category</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="template" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Template</label>
+                        <source_model>Magefan\Blog\Model\Config\Source\LatestFromCategoryTemplate</source_model>
+                        <depends>
+                            <field id="enabled">1</field>
+                        </depends>
+                    </field>
+                    <field id="number_of_posts" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Number of Posts</label>
+                        <depends>
+                            <field id="enabled">1</field>
+                        </depends>
+                    </field>
+                </group>
                 <group id="related_posts" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Related Posts</label>
                     <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -103,6 +129,21 @@
                             <field id="enabled">1</field>
                         </depends>
                     </field>
+                    <field id="autorelated_enabled" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enable Auto Related Posts (Blog+)</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <depends>
+                            <field id="enabled">1</field>
+                        </depends>
+                    </field>
+                    <field id="autorelated_black_words" translate="label" type="textarea" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Black Words For Auto Related</label>
+                        <comment>Blog extension uses words from title and description to automatically define related posts. Enter words separated by comma you want to ignore. </comment>
+                        <depends>
+                            <field id="enabled">1</field>
+                            <field id="autorelated_enabled">1</field>
+                        </depends>
+                    </field>
                 </group>
 
                 <group id="related_products" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -118,6 +159,21 @@
                             <field id="enabled">1</field>
                         </depends>
                     </field>
+                    <field id="autorelated_enabled" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enable Auto Related Products (Blog+)</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <depends>
+                            <field id="enabled">1</field>
+                        </depends>
+                    </field>
+                    <field id="autorelated_black_words" translate="label" type="textarea" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Black Words For Auto Related</label>
+                        <comment>Blog extension uses words from title and description to automatically define related products. Enter words separated by comma you want to ignore. </comment>
+                        <depends>
+                            <field id="enabled">1</field>
+                            <field id="autorelated_enabled">1</field>
+                        </depends>
+                    </field>
                 </group>
 
                 <group id="comments" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -196,6 +252,68 @@
                             <field id="type">magefan</field>
                         </depends>
                     </field>
+                    <field id="format_date" translate="label comment" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Comments Date Format (Blog+)</label>
+                        <depends>
+                            <field id="type">magefan</field>
+                        </depends>
+                        <comment><![CDATA[
+                            For more information about the formatting options <a href="https://www.php.net/manual/en/function.date.php#refsect1-function.date-parameters" target="_blank">click here</a>.
+                        ]]></comment>
+                    </field>
+                    <field id="enabled"  translate="label comment" type="select" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enable Email Notifications (BlogExtra)</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <depends>
+                            <field id="type">magefan</field>
+                        </depends>
+                        <comment>If enabled email notification will be sent to a customer when someone replies to his/her comment or write a new comment on a post customer interested in.</comment>
+                    </field>
+                    <field id="sender_form" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Sender</label>
+                        <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
+                        <depends>
+                            <field id="enabled">1</field>
+                        </depends>
+                    </field>
+                    <field id="email_template"  translate="label comment" type="select" sortOrder="75"  showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Email Template</label>
+                        <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+                        <comment>This email template will be used to sent a notification of reply to a customer's comment</comment>
+                        <depends>
+                            <field id="enabled">1</field>
+                        </depends>
+                    </field>
+                    <field id="admin_enable_comment_notification" translate="label comment" type="select" sortOrder="85" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enable Admin Email Notifications (BlogExtra)</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        <depends>
+                            <field id="type">magefan</field>
+                        </depends>
+                        <comment>If enabled email notification will be sent to Administrator about new comments which need approvement.</comment>
+                    </field>
+                    <field id="admin_send_from" translate="label comment" type="select" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Sender</label>
+                        <source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
+                        <depends>
+                            <field id="admin_enable_comment_notification">1</field>
+                        </depends>
+                    </field>
+                    <field id="admin_send_to" translate="label comment" type="text" sortOrder="105" showInDefault="1"  showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Send To</label>
+                        <comment>Enter email of admin which will receive notification about new comment.</comment>
+                        <depends>
+                            <field id="admin_enable_comment_notification">1</field>
+                        </depends>
+                    </field>
+                    <field id="admin_email_template" translate="label comment" type="select" sortOrder="115" showInDefault="1" showInWebsite="1"  showInStore="1" canRestore="1">
+                        <label>Email Template</label>
+                        <source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
+                        <comment>This email template will be used to sent a notification about new customer comment.</comment>
+                        <depends>
+                            <field id="admin_enable_comment_notification">1</field>
+                        </depends>
+                    </field>
                 </group>
 
                 <group id="nextprev" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -310,6 +428,13 @@
                     <comment>This will be included before head closing tag in page HTML.</comment>
                 </field>
             </group>
+            <group id="blog_search" translate="label" type="text" sortOrder="125" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Blog Search (Blog Extra)</label>
+                <field id="enable_blog_search" translate="label comment" type="select" sortOrder="135" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Include Blog Search Into Catalog Search (BlogExtra)</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+            </group>
             <group id="sidebar" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Sidebar</label>
                 <group id="search" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -322,6 +447,16 @@
                         <label>Sort Order</label>
                     </field>
                 </group>
+                <group id="contents" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Post Contents Widget</label>
+                    <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enabled</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="sort_order" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Sort Order</label>
+                    </field>
+                </group>
                 <group id="categories" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Categories Widget</label>
                     <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -408,6 +543,7 @@
                 </group>
                 <group id="archive" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Archive Widget</label>
+
                     <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                         <label>Enabled</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -416,6 +552,12 @@
                         <label>Archive Group By</label>
                         <source_model>Magefan\Blog\Model\Config\Source\ArchiveGroupBy</source_model>
                     </field>
+                    <field id="format_date" translate="label comment" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Date Format (Blog+)</label>
+                        <comment><![CDATA[
+                            For more information about the formatting options <a href="https://www.php.net/manual/en/function.date.php#refsect1-function.date-parameters" target="_blank">click here</a>.
+                        ]]></comment>
+                    </field>
                     <field id="sort_order" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                         <label>Sort Order</label>
                     </field>
@@ -544,6 +686,9 @@
                     <validate>required-entry</validate>
                     <comment>E.g.: "blog" will make the blog accessible from mystore.com/blog</comment>
                 </field>
+                <field id="version_plus" translate="label comment" type="text" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1">
+                                        <frontend_model>Magefan\BlogPlus\Block\Adminhtml\Config\Form\PermalinkSettingsMessage</frontend_model>
+                </field>
                 <field id="redirect_to_no_slash" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Auto-redirect to No-Slash URL</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -551,7 +696,7 @@
                 </field>
                 <field id="type" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Permalink Type</label>
-                     <source_model>Magefan\Blog\Model\Config\Source\PermalinkType</source_model>
+                    <source_model>Magefan\Blog\Model\Config\Source\PermalinkType</source_model>
                 </field>
 
                 <field id="post_route" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
@@ -617,6 +762,198 @@
                     <validate>required-entry</validate>
                     <comment>E.g.: "search" will make the blog search accessible from mystore.com/{blog_route}/search/query</comment>
                 </field>
+
+            </group>
+            <group id="advanced_permalink" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Advanced Permalink Settings (Blog+)</label>
+                <attribute type="expanded">0</attribute>
+                <field id="enabled" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Enable Advanced Permalink Settings</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="redirect_to_no_slash" translate="label" type="select" sortOrder="12" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Auto-redirect to No-Slash URL</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    <comment><![CDATA[E.g. auto 301 redirect from <b>http://example.com/blog/</b> to <b>http://example.com/blog</b>]]></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="blog_route" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Blog Route</label>
+                    <validate>required-entry</validate>
+                    <comment>E.g.:"myblog" will make the blog accessible from https://mystore.com/myblog</comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="post_path_schema" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Post Path Schema</label>
+                    <comment><![CDATA[Available variables: {{blog_route}}, {{parent_category}}, {{id}}, {{year}}, {{month}}, {{url_key}}.<br/><br/><b>Attantion!</b> Keep <b>{{url_key}}</b> as a last variable in all schemas.]]></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="category_path_schema" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Category Path Schema</label>
+                    <comment><![CDATA[Available variables: {{blog_route}}, {{parent_category}}, {{id}}, {{url_key}}.]]></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="tag_path_schema" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Tag Path Schema</label>
+                    <comment><![CDATA[Available variables: {{blog_route}}, {{id}}, {{url_key}}.]]></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="author_path_schema" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Author Path Schema</label>
+                    <comment><![CDATA[Available variables: {{blog_route}}, {{id}}, {{url_key}}.]]></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="archive_path_schema" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Archive Path Schema</label>
+                    <comment><![CDATA[Available variables: {{blog_route}}, {{url_key}}.]]></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+
+                <field id="search_path_schema" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Search Path Schema</label>
+                    <comment><![CDATA[Available variables: {{blog_route}}, {{url_key}}.]]></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+                <field id="page_pagination_type" translate="label" type="select" sortOrder="90" showInDefault="1" showInWebsite="0" showInStore="1" canRestore="1">
+                    <label>Page Pagination Type</label>
+                                        <source_model>Magefan\BlogPlus\Model\Config\Source\PagePaginationType</source_model>
+                    <comment></comment>
+                    <depends>
+                        <field id="enabled">1</field>
+                    </depends>
+                </field>
+            </group>
+            <group id="sitemap" translate="label" type="text" sortOrder="95" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>XML Sitemap</label>
+                <field id="info" translate="label comment" type="text" sortOrder="0" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <frontend_model>Magefan\BlogPlus\Block\Adminhtml\Config\Form\SitemapInfo</frontend_model>
+                </field>
+                <group id="index" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Blog Index Page</label>
+                    <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enabled</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="frequency" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Frequency</label>
+                        <source_model>Magento\Sitemap\Model\Config\Source\Frequency</source_model>
+                    </field>
+                    <field id="priority" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Priority</label>
+                    </field>
+                </group>
+                <group id="category" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Blog Categories</label>
+                    <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enabled</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="frequency" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Frequency</label>
+                        <source_model>Magento\Sitemap\Model\Config\Source\Frequency</source_model>
+                    </field>
+                    <field id="priority" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Priority</label>
+                    </field>
+                </group>
+                <group id="post" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Blog Posts</label>
+                    <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enabled</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="frequency" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Frequency</label>
+                        <source_model>Magento\Sitemap\Model\Config\Source\Frequency</source_model>
+                    </field>
+                    <field id="priority" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Priority</label>
+                    </field>
+                </group>
+                <group id="author" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Blog Authors</label>
+                    <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enabled</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="frequency" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Frequency</label>
+                        <source_model>Magento\Sitemap\Model\Config\Source\Frequency</source_model>
+                    </field>
+                    <field id="priority" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Priority</label>
+                    </field>
+                </group>
+                <group id="tag" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <label>Blog Tags</label>
+                    <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Enabled</label>
+                        <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                    </field>
+                    <field id="frequency" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Frequency</label>
+                        <source_model>Magento\Sitemap\Model\Config\Source\Frequency</source_model>
+                    </field>
+                    <field id="priority" translate="label comment" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                        <label>Priority</label>
+                    </field>
+                </group>
+            </group>
+            <group id="design" translate="label" type="text" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Design (Blog+)</label>
+                <field id="index_page_layout" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Blog Index Page Layout</label>
+                    <source_model>Magefan\BlogPlus\Model\Config\Source\PageLayout</source_model>
+                </field>
+                <field id="post_page_layout" translate="label comment" type="select" sortOrder="15" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Blog Post Page Layout</label>
+                    <source_model>Magefan\BlogPlus\Model\Config\Source\PageLayout</source_model>
+                </field>
+                <field id="category_page_layout" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Blog Category Page Layout</label>
+                    <source_model>Magefan\BlogPlus\Model\Config\Source\PageLayout</source_model>
+                </field>
+                <field id="tag_page_layout" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Blog Tag Page Layout</label>
+                    <source_model>Magefan\BlogPlus\Model\Config\Source\PageLayout</source_model>
+                </field>
+                <field id="author_page_layout" translate="label comment" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Blog Author Page Layout</label>
+                    <source_model>Magefan\BlogPlus\Model\Config\Source\PageLayout</source_model>
+                </field>
+                <field id="search_page_layout" translate="label comment" type="select" sortOrder="35" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Blog Search Page Layout</label>
+                    <source_model>Magefan\BlogPlus\Model\Config\Source\PageLayout</source_model>
+                </field>
+                <field id="publication_date" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Display Posts Publication Date</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
+                <field id="format_date" translate="label comment" type="text" sortOrder="45" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Posts Publication Date Format</label>
+                    <depends>
+                        <field id="publication_date">1</field>
+                    </depends>
+                    <comment><![CDATA[
+                            For more information about the formatting options <a href="https://www.php.net/manual/en/function.date.php#refsect1-function.date-parameters" target="_blank">click here</a>.
+                        ]]></comment>
+                </field>
             </group>
             <group id="seo" translate="label" type="text" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Search Engine Optimization</label>
diff --git a/etc/config.xml b/etc/config.xml
index c0e02778..db4cf834 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -16,6 +16,12 @@
                 <mftype>1</mftype>
             </general>
             <design>
+                <index_page_layout/>
+                <post_page_layout/>
+                <category_page_layout/>
+                <tag_page_layout/>
+                <author_page_layout/>
+                <search_page_layout/>
                 <format_date>F d, Y</format_date>
                 <publication_date>1</publication_date>
             </design>
@@ -32,6 +38,17 @@
                 <meta_description/>
             </index_page>
             <post_view>
+                <category_posts>
+                    <enabled>0</enabled>
+                    <number_of_posts>5</number_of_posts>
+                </category_posts>
+                <reading_progress_bar>
+                    <enabled>0</enabled>
+                    <position>top</position>
+                    <width>10px</width>
+                    <highlight_color>ff5501</highlight_color>
+                    <highlight_color_opacity>0.7</highlight_color_opacity>
+                </reading_progress_bar>
                 <design>
                     <template>modern</template>
                 </design>
@@ -39,10 +56,16 @@
                     <enabled>1</enabled>
                     <template/>
                     <number_of_posts>5</number_of_posts>
+                    <autorelated_enabled>0</autorelated_enabled>
+                    <autorelated_black_words/>
+                    <autorelated_enabled>0</autorelated_enabled>
+                    <autorelated_black_words/>
                 </related_posts>
                 <related_products>
                     <enabled>1</enabled>
                     <number_of_products>5</number_of_products>
+                    <autorelated_enabled>0</autorelated_enabled>
+                    <autorelated_black_words/>
                 </related_products>
                 <comments>
                     <type>magefan</type>
@@ -55,7 +78,17 @@
                     <display_privacy_policy_checkbox>0</display_privacy_policy_checkbox>
                     <default_status>0</default_status>
                     <format_date>M d, Y H:i</format_date>
+                    <enabled>0</enabled>
+                    <sender_form>general</sender_form>
+                    <email_template>mfblog_post_view_comments_email_template</email_template>
+                    <admin_enable_comment_notification>0</admin_enable_comment_notification>
+                    <admin_send_from>general</admin_send_from>
+                    <admin_send_to/>
+                    <admin_email_template>mfblog_post_view_comments_admin_email_template</admin_email_template>
                 </comments>
+                <blog_search>
+                    <enable_blog_search>0</enable_blog_search>
+                </blog_search>
                 <nextprev>
                     <enabled>1</enabled>
                     <template>modern</template>
@@ -67,6 +100,14 @@
                     <enabled>0</enabled>
                 </reading_time>
             </post_view>
+            <publish_post_on_fb>
+                <enabled>0</enabled>
+                <app_id/>
+                <app_secret/>
+                <page_id/>
+                <post_format>{{var post.title}} -{{post.short_content}}</post_format>
+                <autopublish_categories>0</autopublish_categories>
+            </publish_post_on_fb>
             <post_list>
                 <template>list-modern</template>
                 <posts_per_page>10</posts_per_page>
@@ -155,6 +196,10 @@
                     <sort_order>50</sort_order>
                     <description/>
                 </rss_feed>
+                <contents>
+                    <enabled>0</enabled>
+                    <sort_order>15</sort_order>
+                </contents>
             </sidebar>
             <product_page>
                 <related_posts_enabled>1</related_posts_enabled>
@@ -204,6 +249,45 @@
                     <custom_css/>
                 </css_settings>
             </developer>
+            <advanced_permalink>
+                <enabled>0</enabled>
+                <redirect_to_no_slash>1</redirect_to_no_slash>
+                <blog_route>blog</blog_route>
+                <post_path_schema>{{blog_route}}/post/{{url_key}}</post_path_schema>
+                <category_path_schema>{{blog_route}}/category/{{parent_category}}/{{url_key}}</category_path_schema>
+                <tag_path_schema>{{blog_route}}/tag/{{url_key}}</tag_path_schema>
+                <author_path_schema>{{blog_route}}/author/{{url_key}}</author_path_schema>
+                <archive_path_schema>{{blog_route}}/archive/{{url_key}}</archive_path_schema>
+                <search_path_schema>{{blog_route}}/search/{{url_key}}</search_path_schema>
+                <rss_path_schema>blog/rss/feed</rss_path_schema>
+            </advanced_permalink>
+            <sitemap>
+                <index>
+                    <enabled>1</enabled>
+                    <frequency>daily</frequency>
+                    <priority>1</priority>
+                </index>
+                <category>
+                    <enabled>1</enabled>
+                    <frequency>daily</frequency>
+                    <priority>0.8</priority>
+                </category>
+                <post>
+                    <enabled>1</enabled>
+                    <frequency>daily</frequency>
+                    <priority>0.5</priority>
+                </post>
+                <author>
+                    <enabled>0</enabled>
+                    <frequency>daily</frequency>
+                    <priority>0.5</priority>
+                </author>
+                <tag>
+                    <enabled>0</enabled>
+                    <frequency>daily</frequency>
+                    <priority>0.5</priority>
+                </tag>
+            </sitemap>
         </mfblog>
         <system>
             <media_storage_configuration>
diff --git a/etc/di.xml b/etc/di.xml
index bfc2de78..32d19f8c 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -73,7 +73,11 @@
             <argument name="modelRepository" xsi:type="object">Magefan\Blog\Api\AuthorRepositoryInterface</argument>
         </arguments>
     </virtualType>
-
+    <virtualType name="Magefan\Blog\Model\Config\Source\LatestFromCategoryTemplate" type="Magefan\Blog\Model\Config\Source\Template">
+        <arguments>
+            <argument name="templateType" xsi:type="string">blog_post_view_latest_from_category</argument>
+        </arguments>
+    </virtualType>
     <type name="Magefan\Blog\Model\TemplatePool">
         <arguments>
             <argument name="templates" xsi:type="array">
diff --git a/etc/email_templates.xml b/etc/email_templates.xml
new file mode 100755
index 00000000..98f38e13
--- /dev/null
+++ b/etc/email_templates.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+-->
+<config
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Email:etc/email_templates.xsd"
+>
+  <template
+    id="mfblog_post_view_comments_email_template"
+    label="Magefan BlogExtra Customer Comment Notification Template"
+    file="mfblog_post_view_comments_email_template.html"
+    type="html"
+    module="Magefan_BlogExtra"
+    area="frontend"
+  />
+  <template
+      id="mfblog_post_view_comments_admin_email_template"
+      label="Magefan BlogExtra Admin Comment Notification Template"
+      file="mfblog_post_view_comments_admin_email_template.html"
+      type="html"
+      module="Magefan_BlogExtra"
+      area="frontend"
+    />
+</config>