diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0d8b84ef..360ba459 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,4 +1,8 @@
 == Changelog ==
+= 7.0.4 - Jul 15, 2025 =
+- Improved compatibility with the Jetpack plugin to ensure storefront scripts load correctly when 'Defer Non-Essential JavaScript' is enabled.
+- Applied minor fixes and general improvements for better performance and stability.
+
 = 7.0.3 - Jun 24, 2025 =
 - Internal improvements and minor fixes for Gutenberg ecommerce blocks.
 
diff --git a/README.md b/README.md
index 06369c91..336965d3 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ With Ecwid, you can include your ecommerce shop on multiple websites, blogs, soc
 
 ### Mobile Responsive Design
 
-Ecwid works great on any Wordpress site, especially those running on mobile-optimized themes. Your online store looks perfect on smartphones and automatically adapts to your customer’s screen size: laptops, tablets, smart TVs or smart watches. Check out this [demo](https://ecwid.to/ecwid-demo-store)
+Ecwid works great on any Wordpress site, especially those running on mobile-optimized themes. Your online store looks perfect on smartphones and automatically adapts to your customer’s screen size: laptops, tablets, smart TVs or smart watches. Check out this [demo](https://go.lightspeedhq.com/ecwid-demo-store)
 
 ### Hundreds of extensions and powerful API
 
@@ -45,17 +45,17 @@ There is a lot of in-house and third party extensions built on the Ecwid Ecommer
 
 ### Plans start at just $5/mo
 
-Start selling ealisy with no big investment. As your online shop grows, Ecwid grows with you. When the time is right, consider upgrading your store to one of our premium plans to get more robust features and preferred support. See also: [Ecwid plan and pricing](https://ecwid.to/ecwid-pricing)
+Start selling ealisy with no big investment. As your online shop grows, Ecwid grows with you. When the time is right, consider upgrading your store to one of our premium plans to get more robust features and preferred support. See also: [Ecwid plan and pricing](https://go.lightspeedhq.com/ecwid-pricing)
 
 ### See Ecwid In Action
 
-* [Demo Store](https://ecwid.to/ecwid-demo-store "Ecwid demo")
-* [Ecwid Ecommerce Control panel](https://ecwid.to/ecwid-store-control-panel "Ecwid Control Panel") (you will be able to create an Ecwid account)
-* [Showcase](https://ecwid.to/ecwid-wp-site)
+* [Demo Store](https://go.lightspeedhq.com/ecwid-demo-store "Ecwid demo")
+* [Ecwid Ecommerce Control panel](https://go.lightspeedhq.com/ecwid-store-control-panel "Ecwid Control Panel") (you will be able to create an Ecwid account)
+* [Showcase](https://go.lightspeedhq.com/ecwid-wp-site)
 
 ### Ecwid Site
 
-* [www.ecwid.com](https://ecwid.to/ecwid-wp-site "Ecwid site")
+* [www.ecwid.com](https://go.lightspeedhq.com/ecwid-wp-site "Ecwid site")
 
 
 ## Installation
diff --git a/ecwid-shopping-cart.php b/ecwid-shopping-cart.php
index 4164ec58..cff8e69c 100644
--- a/ecwid-shopping-cart.php
+++ b/ecwid-shopping-cart.php
@@ -5,8 +5,8 @@
 Description: Ecwid by Lightspeed is a full-featured shopping cart. It can be easily integrated with any Wordpress blog and takes less than 5 minutes to set up.
 Text Domain: ecwid-shopping-cart
 Author: Ecwid Ecommerce
-Version: 7.0.3
-Author URI: https://ecwid.to/ecwid-site
+Version: 7.0.4
+Author URI: https://go.lightspeedhq.com/ecwid-site
 License: GPLv2 or later
 */
 
@@ -1222,11 +1222,11 @@ function ecwid_get_scriptjs_code( $force_lang = null ) {
 		$store_id = get_ecwid_store_id();
 		$params = ecwid_get_scriptjs_params();
 
-		$code .= '<script data-cfasync="false" type="text/javascript" src="https://' . Ecwid_Config::get_scriptjs_domain() . '/script.js?' . $store_id . $params . '"></script>'; //phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+		$code .= '<script data-cfasync="false" data-no-optimize="1" src="https://' . Ecwid_Config::get_scriptjs_domain() . '/script.js?' . $store_id . $params . '"></script>'; //phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
 	}
 
 	$code .= ecwid_sso();
-	$code .= '<script type="text/javascript">if (typeof jQuery !== undefined && jQuery.mobile) { jQuery.mobile.hashListeningEnabled = false; jQuery.mobile.pushStateEnabled=false; }</script><!--/noptimize-->';
+	$code .= '<script data-cfasync="false" data-no-optimize="1">if (typeof jQuery !== undefined && jQuery.mobile) { jQuery.mobile.hashListeningEnabled = false; jQuery.mobile.pushStateEnabled=false; }</script><!--/noptimize-->';
 
 	return apply_filters( 'ecwid_scriptjs_code', $code );
 }
diff --git a/includes/class-ecwid-ajax-defer-renderer.php b/includes/class-ecwid-ajax-defer-renderer.php
index d29a0fbd..9fe9a64d 100644
--- a/includes/class-ecwid-ajax-defer-renderer.php
+++ b/includes/class-ecwid-ajax-defer-renderer.php
@@ -94,7 +94,7 @@ public function render_shortcode( $shortcode ) {
 
 	public function add_shortcodes( $content ) {
 		$ecwid_store_id = get_ecwid_store_id();
-		$before         = '<script>var ecwid_shortcodes = [];</script>';
+		$before         = '<script data-cfasync="false" data-no-optimize="1">var ecwid_shortcodes = [];</script>';
 
 		$scriptjs_domain = esc_attr( Ecwid_Config::get_scriptjs_domain() );
 
@@ -104,7 +104,7 @@ public function add_shortcodes( $content ) {
 		$script_src = "https://$scriptjs_domain/script.js?$ecwid_store_id&data_platform=wporg&lang=$lang";
 		ob_start();
 		?>
-		<script>
+		<script data-cfasync="false" data-no-optimize="1">
 			window.ecwid_script_defer = true;
 			window.ecwid_dynamic_widgets = true;
 
diff --git a/includes/class-ecwid-floating-minicart.php b/includes/class-ecwid-floating-minicart.php
index 58aefcaa..10ebe5bc 100644
--- a/includes/class-ecwid-floating-minicart.php
+++ b/includes/class-ecwid-floating-minicart.php
@@ -93,7 +93,7 @@ public function display() {
 				data-icon='<?php echo esc_attr( $icon ); ?>'
 			></div>
 
-			<script>
+			<script data-cfasync="false" data-no-optimize="1">
 			if (typeof Ecwid != 'undefined'){
 				Ecwid.init();
 			}
diff --git a/includes/gutenberg/class-ecwid-gutenberg-block-cart-page.php b/includes/gutenberg/class-ecwid-gutenberg-block-cart-page.php
index 7f9a86f5..fe2598b3 100644
--- a/includes/gutenberg/class-ecwid-gutenberg-block-cart-page.php
+++ b/includes/gutenberg/class-ecwid-gutenberg-block-cart-page.php
@@ -31,7 +31,7 @@ public function render_callback( $params ) {
 
 		ob_start();
 		?>
-		<script>
+		<script data-cfasync="false" data-no-optimize="1">
 		Ecwid.OnAPILoaded.add(function() {
 			Ecwid.OnPageLoad.add(function(page) {
 				if ("CATEGORY" == page.type && 0 == page.categoryId && !page.hasPrevious) {
diff --git a/includes/gutenberg/class-ecwid-gutenberg-block-filters-page.php b/includes/gutenberg/class-ecwid-gutenberg-block-filters-page.php
index 6cdf6c42..858badf5 100644
--- a/includes/gutenberg/class-ecwid-gutenberg-block-filters-page.php
+++ b/includes/gutenberg/class-ecwid-gutenberg-block-filters-page.php
@@ -50,7 +50,7 @@ public function render_callback( $params ) {
 	public static function get_script_for_open_filters_page() {
 		ob_start();
 		?>
-		<script>
+		<script data-cfasync="false" data-no-optimize="1">
 		Ecwid.OnAPILoaded.add(function() {
 			Ecwid.OnPageLoad.add(function(page) {
 				if ("CATEGORY" == page.type && 0 == page.categoryId && !page.hasPrevious) {
diff --git a/includes/gutenberg/class-ecwid-gutenberg-block-minicart.php b/includes/gutenberg/class-ecwid-gutenberg-block-minicart.php
index 8e7f9bb5..bebdd3d5 100644
--- a/includes/gutenberg/class-ecwid-gutenberg-block-minicart.php
+++ b/includes/gutenberg/class-ecwid-gutenberg-block-minicart.php
@@ -40,7 +40,7 @@ public function render_callback( $params ) {
 		></div>
 
 		<!--noptimize-->
-		<script>
+		<script data-cfasync="false" data-no-optimize="1">
 			if (typeof Ecwid != 'undefined'){
 				Ecwid.init();
 			}
diff --git a/includes/shortcodes/class-ecwid-shortcode-productbrowser.php b/includes/shortcodes/class-ecwid-shortcode-productbrowser.php
index 1bc5f9f5..44673756 100644
--- a/includes/shortcodes/class-ecwid-shortcode-productbrowser.php
+++ b/includes/shortcodes/class-ecwid-shortcode-productbrowser.php
@@ -335,7 +335,7 @@ public function get_js_for_open_page( $page = '' ) {
 
 		ob_start();
 		?>
-		<script>
+		<script data-cfasync="false" data-no-optimize="1">
 		Ecwid.OnAPILoaded.add(function() {
 			Ecwid.OnPageLoad.add(function(page) {
 				if ("CATEGORY" == page.type && 0 == page.categoryId && !page.hasPrevious) {
diff --git a/includes/widgets/nsf-minicart.tpl.php b/includes/widgets/nsf-minicart.tpl.php
index 0891cd89..55f85cfa 100644
--- a/includes/widgets/nsf-minicart.tpl.php
+++ b/includes/widgets/nsf-minicart.tpl.php
@@ -12,7 +12,7 @@
 ></div>
 
 <!--noptimize-->
-<script>
+<script data-cfasync="false" data-no-optimize="1">
 if (typeof Ecwid != 'undefined') {
 	Ecwid.init();
 }
diff --git a/js/gutenberg/buynow.jsx b/js/gutenberg/buynow.jsx
new file mode 100644
index 00000000..a7815004
--- /dev/null
+++ b/js/gutenberg/buynow.jsx
@@ -0,0 +1,146 @@
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+
+
+if ( !EcwidGutenbergParams.isDemoStore ) {
+
+const { __, _x } = wp.i18n; // Import __() from wp.i18n
+
+const {
+    BlockControls,
+    registerBlockType,
+} = wp.blocks;
+
+const {
+    InspectorControls,
+} = wp.editor;
+
+const {
+    PanelBody,
+	ToggleControl,
+} = wp.components;
+
+const { withState } = wp.compose;
+
+const {
+    Fragment
+} = wp.element;
+	
+registerBlockType( 'ec-store/buynow', {
+	title: __( 'Buy Now Button', 'ecwid-shopping-cart' ),
+	icon: EcwidIcons.button, 
+	category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+    attributes: {
+        id: {type: 'integer'},
+        show_price_on_button: {type: 'boolean', default: true},
+        center_align: {type: 'boolean', default: true}
+    },
+	description: __( 'Display a buy button', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+		align: true,
+        alignWide: false,
+        isPrivate: !EcwidGutenbergParams.isApiAvailable
+    },
+
+	/**
+	 * The edit function describes the structure of your block in the context of the editor.
+	 * This represents what the editor will render when the block is used.
+	 *
+	 * The "edit" property must be a valid function.
+	 *
+	 * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+	 */
+	edit: function( props ) {
+        
+        const { attributes } = props;
+		
+        const saveCallback = function( params ) {
+
+            const attributes = {
+                'id': params.newProps.id
+            };
+			
+            EcwidGutenbergParams.products[params.newProps.id] = {
+            	name: params.newProps.product.name,
+				imageUrl: params.newProps.product.thumb
+			};
+            
+            params.originalProps.setAttributes(attributes);
+        };
+		
+        const editor = <div className="ec-store-block ec-store-block-buynow">
+            { !attributes.id &&
+				<div>
+					<div className="image">
+					</div>
+					
+					<div className="button-container">
+						<button className="button ec-store-block-button" onClick={ () => { var params = {'saveCallback':saveCallback, 'props': props}; ecwid_open_product_popup( params ); } }>{ EcwidGutenbergParams.chooseProduct }</button> 
+					</div>
+				</div>
+            }
+            
+			{ attributes.id &&
+				<div className="image">
+				</div>
+			}			
+		</div>;
+
+        function buildToggle(props, name, label) {
+            return <ToggleControl
+				label={ label }
+				checked={ props.attributes[name] }
+				onChange={ () => props.setAttributes( { [name]: ! props.attributes[name] } ) }
+			/>
+        }
+
+        function openEcwidProductPopup( props ) {
+        	ecwid_open_product_popup( { 'saveCallback': saveCallback, 'props': props } );
+		}
+        
+        return ([
+        	editor, 
+			<InspectorControls>
+                {attributes.id &&
+				<div>
+					<div className="ec-store-inspector-row">
+						<label className="ec-store-inspector-subheader">{ __( 'Linked product', 'ecwid-shopping-cart' ) }</label>
+					</div>
+					
+					<div className="ec-store-inspector-row">
+	
+						{ EcwidGutenbergParams.products && EcwidGutenbergParams.products[attributes.id] &&
+						<label>{ EcwidGutenbergParams.products[attributes.id].name }</label>
+						}
+	
+						<button className="button" onClick={ () => openEcwidProductPopup( props ) }>{ __( 'Change', 'ecwid-shopping-cart' ) }</button>
+					</div>
+				</div>
+                }
+                {!attributes.id &&
+				<div className="ec-store-inspector-row">
+					<button className="button" onClick={ () => openEcwidProductPopup( props ) }>{ __( 'Choose product', 'ecwid-shopping-cart' ) }</button>
+				</div>
+                }
+                
+				<br />
+                <PanelBody title={ __( 'Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { buildToggle( props, 'show_price_on_button', __( 'Show price inside the «Buy now» button', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'center_align', __( 'Center align on a page', 'ecwid-shopping-cart' ) ) }
+				</PanelBody>
+			</InspectorControls>
+        ]); 
+	},
+
+	save: function( props ) {
+        return false;
+    },
+    
+} );
+
+}
\ No newline at end of file
diff --git a/js/gutenberg/cart-page.jsx b/js/gutenberg/cart-page.jsx
new file mode 100644
index 00000000..85fd2d2e
--- /dev/null
+++ b/js/gutenberg/cart-page.jsx
@@ -0,0 +1,97 @@
+/**
+ * BLOCK: my-block
+ *
+ * Registering a basic block with Gutenberg.
+ * Simple block, renders and saves the same content without any interactivity.
+ */
+
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+import { EcwidControls, EcwidProductBrowserBlock, EcwidImage } from '../includes/controls.js';
+
+const { __, _x } = wp.i18n;
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+const {
+    InspectorControls,
+} = wp.editor;
+
+const {
+    PanelBody,
+    PanelRow,
+    ToggleControl,
+    ButtonGroup,
+    Button,
+    BaseControl,
+    Toolbar,
+    ColorPalette,
+    ColorIndicator
+} = wp.components;
+
+const { withState } = wp.compose;
+
+const blockName = 'ec-store/cart-page';
+
+const blockParams = EcwidGutenbergParams.blockParams[blockName];
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ec-store/cart-page', {
+    title: __( 'Cart and Checkout', 'ecwid-shopping-cart' ), // Block title.
+    icon: EcwidIcons.cartPage,
+    category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+    attributes: blockParams.attributes,
+    description: __( 'Display shopping cart and checkout page', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+        multiple: false
+    },
+
+    /**
+     * The edit function describes the structure of your block in the context of the editor.
+     * This represents what the editor will render when the block is used.
+     *
+     * The "edit" property must be a valid function.
+     *
+     * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+     */
+    edit: function( props ) {
+
+        const { attributes } = props;
+
+
+        const editor =
+            <EcwidProductBrowserBlock icon={ EcwidIcons.cartPage } title={ __( 'Cart and Checkout', 'ecwid-shopping-cart' ) }>
+                <EcwidImage src="cart-page-preview.png" />
+            </EcwidProductBrowserBlock>;
+
+        function buildDangerousHTMLMessageWithTitle( title, message ) {
+            return <BaseControl label={ title }><div dangerouslySetInnerHTML={{ __html: message }} /></BaseControl>;
+        }
+
+        return ([
+            editor
+        ]);
+    },
+
+    save: function( props ) {
+        return null;
+    }
+} );
diff --git a/js/gutenberg/categories.jsx b/js/gutenberg/categories.jsx
new file mode 100644
index 00000000..47e57dee
--- /dev/null
+++ b/js/gutenberg/categories.jsx
@@ -0,0 +1,86 @@
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+
+if ( !EcwidGutenbergParams.isDemoStore ) {
+
+const {
+	InspectorControls
+} = wp.editor;
+
+const { __, _x } = wp.i18n; // Import __() from wp.i18n
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+const blockName = 'ec-store/categories';
+
+const blockParams = EcwidGutenbergParams.blockParams[blockName];
+
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ec-store/categories', {
+	title: __( 'Store Categories Menu', 'ecwid-shopping-cart' ),
+	icon: EcwidIcons.categories, 
+	category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+	description: __( 'Display categories navigation bar', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+		isPrivate: !EcwidGutenbergParams.isApiAvailable
+    },
+
+	/**
+	 * The edit function describes the structure of your block in the context of the editor.
+	 * This represents what the editor will render when the block is used.
+	 *
+	 * The "edit" property must be a valid function.
+	 *
+	 * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+	 */
+	edit: function( props ) {
+        
+        const { attributes } = props;
+		
+        const editor = <div className="ec-store-block ec-store-block-categories">
+			<div className="ec-store-block-header">
+                { EcwidIcons.categories }
+				{ __( 'Categories', 'ecwid-shopping-cart' ) }
+			</div>
+		</div>;
+        
+		const message = __( 'The block is hidden because you don\'t have categories in your store. <a target="_blank" href="admin.php?page=ec-store-admin-category-id-0-mode-edit">Add categories.</a>', 'ecwid-shopping-cart' );	
+			
+        return ([
+        	editor,
+			<InspectorControls>
+				<div style={{ height: '10px' }}></div>
+
+                { !blockParams.has_categories &&
+				<div dangerouslySetInnerHTML={{__html: message}}/>
+                }
+			</InspectorControls>
+        ]); 
+	},
+
+	save: function( props ) {
+        return false;
+    },
+    
+} );
+
+}
\ No newline at end of file
diff --git a/js/gutenberg/category-page.jsx b/js/gutenberg/category-page.jsx
new file mode 100644
index 00000000..db43aaaf
--- /dev/null
+++ b/js/gutenberg/category-page.jsx
@@ -0,0 +1,207 @@
+/**
+ * BLOCK: my-block
+ *
+ * Registering a basic block with Gutenberg.
+ * Simple block, renders and saves the same content without any interactivity.
+ */
+
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+import { EcwidControls, EcwidInspectorSubheader, EcwidProductBrowserBlock } from '../includes/controls.js';
+
+const { __, _x } = wp.i18n; // Import __() from wp.i18n
+
+const ecwidIcons = EcwidIcons;
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+const {
+    InspectorControls,
+} = wp.editor;
+
+const {
+    PanelBody,
+    BaseControl,
+} = wp.components;
+
+const blockName = 'ec-store/category-page';
+
+const blockParams = EcwidGutenbergParams.blockParams[blockName];
+
+
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+ 
+registerBlockType( 'ec-store/category-page', {
+    title: __( 'Store Category Page', 'ecwid-shopping-cart' ), // Block title.
+    icon: EcwidIcons.category,
+    category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+    attributes: EcwidGutenbergStoreBlockParams.attributes,
+    description: __( 'Display category page', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+        multiple: false
+    },
+
+    /**
+     * The edit function describes the structure of your block in the context of the editor.
+     * This represents what the editor will render when the block is used.
+     *
+     * The "edit" property must be a valid function.
+     *
+     * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+     */
+    edit: function( props ) {
+
+        const { attributes } = props;
+
+        // legacy reset 
+        props.setAttributes({widgets:''});
+
+        const editor =
+            <EcwidProductBrowserBlock icon={ EcwidIcons.category } title={ __( 'Store Category Page', 'ecwid-shopping-cart' ) } showDemoButton={ blockParams.isDemoStore }>
+                <div className="ec-store-category-products">
+                    <div className="ec-store-category-product1"></div>
+                    <div className="ec-store-category-product2"></div>
+                    <div className="ec-store-category-product3"></div>
+                </div>
+                <div className="ec-store-category-products">
+                    <div className="ec-store-category-product4"></div>
+                    <div className="ec-store-category-product5"></div>
+                    <div className="ec-store-category-product6"></div>
+                </div>
+            </EcwidProductBrowserBlock>;
+
+        function buildDangerousHTMLMessageWithTitle( title, message ) {
+            return <BaseControl label={ title }><div dangerouslySetInnerHTML={{ __html: message }} /></BaseControl>;
+        }
+				
+        const productMigrationWarning = buildDangerousHTMLMessageWithTitle(
+            '',
+            __( 'To improve the look and feel of your store and manage your storefront appearance here, please enable the “Next-gen look and feel of the product list on the storefront” option in your store dashboard (“<a href="admin.php?page=ec-store&ec-store-page=whatsnew">Settings → What’s New</a>”).', 'ecwid-shopping-cart' )
+        );
+
+        const cartIconMessage = buildDangerousHTMLMessageWithTitle(
+            __( 'Display cart icon', 'ecwid-shopping-cart' ),
+            blockParams.customizeMinicartText
+        );
+
+        const isNewProductList = blockParams.isNewProductList;
+        const isNewDetailsPage = blockParams.isNewDetailsPage;
+        
+        const controls = EcwidControls(blockParams.attributes, props);
+
+        return ([
+            editor,
+            <InspectorControls>
+                <div style={{height:"10px"}}></div>
+                { !EcwidGutenbergParams.hasCategories &&
+                    <div style={{margin:'10px'}}>    
+                        <a href="admin.php?page=ec-store-admin-category-id-0-mode-edit" target="_blank" class="button button-primary">{ __('Add categories', 'ecwid-shopping-cart') }</a>
+                    </div>
+                }
+                { EcwidGutenbergParams.hasCategories &&
+                    [
+                    !props.attributes.default_category_id &&
+                        controls.select( 'default_category_id', __( 'Select category', 'ecwid-shopping-cart' ) ),
+                    props.attributes.default_category_id && 
+                        controls.select( 'default_category_id', __( 'Selected category', 'ecwid-shopping-cart' ) )
+                    ]
+                }
+                <PanelBody title={ __('Category List Appearance', 'ecwid-shopping-cart') } initialOpen={false}>
+                    { isNewProductList &&
+                    [
+                        controls.select('product_list_category_title_behavior'),
+                        attributes.product_list_category_title_behavior !== 'SHOW_TEXT_ONLY' &&
+                        [
+                            controls.buttonGroup('product_list_category_image_size'),
+                            controls.toolbar('product_list_category_image_aspect_ratio'),
+                        ]
+                    ]
+                    }
+                    { !isNewProductList && productMigrationWarning }
+                </PanelBody>
+                
+                <PanelBody title={ __( 'Product List Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { isNewProductList &&
+                    [
+                        controls.toggle( 'product_list_show_product_images' ),
+                        attributes.product_list_show_product_images && [
+                            controls.buttonGroup( 'product_list_image_size' ),
+                            controls.toolbar( 'product_list_image_aspect_ratio' )
+                        ],
+                        controls.toolbar( 'product_list_product_info_layout' ),
+                        controls.select( 'product_list_title_behavior' ),
+                        controls.select( 'product_list_price_behavior' ),
+                        controls.select( 'product_list_sku_behavior' ),
+                        controls.select( 'product_list_buybutton_behavior' ),
+                        controls.toggle( 'product_list_show_additional_image_on_hover' ),
+                        controls.toggle( 'product_list_show_frame' )
+                    ]
+                    }
+                    { !isNewProductList && productMigrationWarning }
+                </PanelBody>
+
+                <PanelBody title={ __( 'Product Page Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { isNewDetailsPage &&
+                    [
+                        controls.select('product_details_layout'),
+                        ( attributes.product_details_layout === 'TWO_COLUMNS_SIDEBAR_ON_THE_RIGHT'
+                        || attributes.product_details_layout === 'TWO_COLUMNS_SIDEBAR_ON_THE_LEFT' ) &&
+                        controls.toggle('show_description_under_image'),
+                        controls.toolbar('product_details_gallery_layout'),
+                        EcwidInspectorSubheader( __('Product sidebar content', 'ecwid-shopping-cart') ),
+                        controls.toggle('product_details_show_product_name'),
+                        controls.toggle('product_details_show_breadcrumbs'),
+                        controls.toggle('product_details_show_product_sku'),
+                        controls.toggle('product_details_show_product_price'),
+                        controls.toggle('product_details_show_qty'),
+                        controls.toggle('product_details_show_number_of_items_in_stock'),
+                        controls.toggle('product_details_show_in_stock_label'),
+                        controls.toggle('product_details_show_wholesale_prices'),
+                        controls.toggle('product_details_show_share_buttons'),
+                    ]
+                    }
+                    { !isNewDetailsPage && productDetailsMigrationWarning }
+                </PanelBody>
+                <PanelBody title={ __( 'Store Navigation', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { controls.toggle( 'show_categories') }
+                    { controls.toggle( 'show_search') }
+                    { controls.toggle( 'show_breadcrumbs') }
+                    { isNewProductList && controls.toggle( 'show_footer_menu' ) }
+                    { controls.toggle( 'show_signin_link') }
+                    { controls.toggle( 'product_list_show_sort_viewas_options') }
+                    { cartIconMessage }
+                </PanelBody>
+                <PanelBody title={ __( 'Color settings', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { controls.color( 'chameleon_color_button' ) }
+                    { controls.color( 'chameleon_color_foreground' ) }
+                    { controls.color( 'chameleon_color_price' ) }
+                    { controls.color( 'chameleon_color_link' ) }
+                    { controls.color( 'chameleon_color_background' ) }
+                </PanelBody>
+            </InspectorControls>
+        ]);
+    },
+
+    save: function( props ) {
+        return null;
+    },
+} );
diff --git a/js/gutenberg/filters-page.jsx b/js/gutenberg/filters-page.jsx
new file mode 100644
index 00000000..83767df1
--- /dev/null
+++ b/js/gutenberg/filters-page.jsx
@@ -0,0 +1,171 @@
+/**
+ * BLOCK: my-block
+ *
+ * Registering a basic block with Gutenberg.
+ * Simple block, renders and saves the same content without any interactivity.
+ */
+
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+import { EcwidControls, EcwidProductBrowserBlock, EcwidImage } from '../includes/controls.js';
+
+const { __, _x } = wp.i18n;
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+const {
+    InspectorControls,
+} = wp.editor;
+
+const {
+    PanelBody,
+    PanelRow,
+    ToggleControl,
+    ButtonGroup,
+    Button,
+    BaseControl,
+    Toolbar,
+    ColorPalette,
+    ColorIndicator
+} = wp.components;
+
+const { withState } = wp.compose;
+
+const blockName = 'ec-store/filters-page';
+
+const blockParams = EcwidGutenbergParams.blockParams[blockName];
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ec-store/filters-page', {
+    title: __( 'Product Search and filters', 'ecwid-shopping-cart' ), // Block title.
+    icon: EcwidIcons.filters,
+    category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+    attributes: blockParams.attributes,
+    description: __( 'Display search page with filters on a side', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+        multiple: false
+    },
+
+    /**
+     * The edit function describes the structure of your block in the context of the editor.
+     * This represents what the editor will render when the block is used.
+     *
+     * The "edit" property must be a valid function.
+     *
+     * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+     */
+    edit: function( props ) {
+
+        const { attributes } = props;
+        
+        const editor =
+            <EcwidProductBrowserBlock icon={ EcwidIcons.filters } title={ __( 'Search and Filters', 'ecwid-shopping-cart' ) }>
+                <EcwidImage src="filter-preview.png" />
+            </EcwidProductBrowserBlock>;
+ /*       const editor =
+            <div className="ec-store-block ec-store-block-filters-page">
+                <div className="ec-store-block-header">
+                    { EcwidIcons.filters }
+                    { __( 'Filters Page', 'ecwid-shopping-cart' ) }
+                </div>
+                <div className="image">
+                </div>
+                { blockParams.isDemoStore &&
+                <div>
+                    <a className="button button-primary" href="admin.php?page=ec-store">{ __( 'Set up your store', 'ecwid-shopping-cart') }</a>
+                </div>
+                }
+            </div>
+        ;*/
+
+        function buildDangerousHTMLMessageWithTitle( title, message ) {
+            return <BaseControl label={ title }><div dangerouslySetInnerHTML={{ __html: message }} /></BaseControl>;
+        }
+
+        const filtersDisabledMessage = buildDangerousHTMLMessageWithTitle(
+            '',
+            __( 'You can enable filters in the store settings: (“<a target="_blank" href="admin.php?page=ec-store-admin-product-filters-mode-main">Settings → Product Filters</a>”).', 'ecwid-shopping-cart' )
+        );
+        
+        const productMigrationWarning = buildDangerousHTMLMessageWithTitle(
+            '',
+            __( 'To improve the look and feel of your store and manage your storefront appearance here, please enable the “Next-gen look and feel of the product list on the storefront” option in your store dashboard (“<a href="admin.php?page=ec-store&ec-store-page=whatsnew">Settings → What’s New</a>”).', 'ecwid-shopping-cart' )
+        );  
+        
+        const isNewProductList = blockParams.isNewProductList;
+        
+        const controls = EcwidControls(blockParams.attributes, props);
+
+        return ([
+            editor,
+            <InspectorControls>
+                <PanelBody title={ __( 'Filters', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { !blockParams.filtersEnabled && filtersDisabledMessage }
+                    { blockParams.filtersEnabled &&
+                        [
+                            controls.select( 'product_filters_position_search_page' )
+                        ]
+                    }
+                </PanelBody>
+
+                <PanelBody title={ __( 'Product List Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { isNewProductList &&
+                    [
+                        controls.toggle( 'product_list_show_product_images' ),
+                        attributes.product_list_show_product_images && [
+                            controls.buttonGroup( 'product_list_image_size' ),
+                            controls.toolbar( 'product_list_image_aspect_ratio' )
+                        ],
+                        controls.toolbar( 'product_list_product_info_layout' ),
+                        controls.select( 'product_list_title_behavior' ),
+                        controls.select( 'product_list_price_behavior' ),
+                        controls.select( 'product_list_sku_behavior' ),
+                        controls.select( 'product_list_buybutton_behavior' ),
+                        controls.toggle( 'product_list_show_additional_image_on_hover' ),
+                        controls.toggle( 'product_list_show_frame' )
+                    ]
+                    }
+                    { !isNewProductList && productMigrationWarning }
+                </PanelBody>
+
+                <PanelBody title={ __( 'Store Navigation', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { controls.toggle( 'show_categories') }
+                    { controls.toggle( 'show_breadcrumbs') }
+                    { isNewProductList && controls.toggle( 'show_footer_menu' ) }
+                    { controls.toggle( 'show_signin_link') }
+                    { controls.toggle( 'product_list_show_sort_viewas_options') }
+                </PanelBody>
+                
+                <PanelBody title={ __( 'Color settings', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { controls.color( 'chameleon_color_button' ) }
+                    { controls.color( 'chameleon_color_foreground' ) }
+                    { controls.color( 'chameleon_color_price' ) }
+                    { controls.color( 'chameleon_color_link' ) }
+                    { controls.color( 'chameleon_color_background' ) }
+                </PanelBody>
+            </InspectorControls>
+        ]);
+    },
+
+    save: function( props ) {
+        return null;
+    }
+} );
diff --git a/js/gutenberg/minicart.jsx b/js/gutenberg/minicart.jsx
new file mode 100644
index 00000000..993ade96
--- /dev/null
+++ b/js/gutenberg/minicart.jsx
@@ -0,0 +1,108 @@
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+
+import {EcwidIcons} from '../icons.js';
+
+if ( !EcwidGutenbergParams.isDemoStore ) {
+
+const { __, _x } = wp.i18n; // Import __() from wp.i18n
+
+const {
+	InspectorControls
+} = wp.editor;
+
+const {
+    PanelBody,
+	BaseControl,
+} = wp.components;
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ec-store/minicart', {
+	title: __( 'Shopping Cart Icon', 'ecwid-shopping-cart' ),
+	icon: EcwidIcons.cart, 
+	category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+	description: __( 'Display shopping bag link and summary', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+		isPrivate: !EcwidGutenbergParams.isApiAvailable,
+		align: true,
+		alignWide: false
+    },
+	attributes: EcwidGutenbergParams.minicartAttributes,
+
+	/**
+	 * The edit function describes the structure of your block in the context of the editor.
+	 * This represents what the editor will render when the block is used.
+	 *
+	 * The "edit" property must be a valid function.
+	 *
+	 * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+	 */
+	edit: function( props ) {
+        
+        const { attributes } = props;
+
+        function buildSelect(props, name, label, items) {
+            return <BaseControl label={ label }>
+				<select className="ec-store-inspector-select" onChange={ (event) => { props.setAttributes( { [name]:event.target.value } ) } }>
+                    { items.map( function(item) {
+                        return <option value={item.value} selected={ props.attributes[name] == item.value }>{item.title}</option>
+                    })}
+				</select>
+			</BaseControl>;
+        }
+
+        function buildItem(props, name, type) {
+
+            const item = EcwidGutenbergParams.minicartAttributes[name];
+
+            if ( typeof type === 'undefined' ) {
+                type = item.type;
+            }
+
+			return buildSelect( props, item.name, item.title, item.values );
+        }
+        
+        const editor = <div className="ec-store-block ec-store-block-minicart">
+			<div className="image">
+			</div>
+		</div>;
+        
+        return ([
+        	editor,
+			<InspectorControls>
+				<PanelBody title={ __('Appearance', 'ecwid-shopping-cart') } initialOpen={true}>
+				{ buildItem(props, 'layout', 'select' ) }
+				{ buildItem(props, 'icon', 'select' ) }
+				{ buildItem(props, 'fixed_shape', 'select' ) }
+				</PanelBody>
+			</InspectorControls>	
+		]); 
+	},
+
+	save: function( props ) {
+        return false;
+    },
+    
+} );
+
+}
\ No newline at end of file
diff --git a/js/gutenberg/product-page.jsx b/js/gutenberg/product-page.jsx
new file mode 100644
index 00000000..1b29f69e
--- /dev/null
+++ b/js/gutenberg/product-page.jsx
@@ -0,0 +1,180 @@
+/**
+ * BLOCK: my-block
+ *
+ * Registering a basic block with Gutenberg.
+ * Simple block, renders and saves the same content without any interactivity.
+ */
+
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+import { EcwidControls, EcwidInspectorSubheader, EcwidProductBrowserBlock, EcwidImage } from '../includes/controls.js';
+
+const { __, _x } = wp.i18n;
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+const {
+    InspectorControls,
+} = wp.editor;
+
+const {
+    PanelBody,
+    BaseControl
+} = wp.components;
+
+const { withState } = wp.compose;
+
+const blockName = 'ec-store/product-page';
+
+const blockParams = EcwidGutenbergParams.blockParams[blockName];
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ec-store/product-page', {
+    title: __( 'Product Card Large', 'ecwid-shopping-cart' ),
+    icon: EcwidIcons.product,
+    category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+    attributes: blockParams.attributes,
+    description: __( 'Display product page with description and a buy button', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+        multiple: false
+    },
+
+    /**
+     * The edit function describes the structure of your block in the context of the editor.
+     * This represents what the editor will render when the block is used.
+     *
+     * The "edit" property must be a valid function.
+     *
+     * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+     */
+    edit: function( props ) {
+
+        const { attributes } = props;
+
+        const saveCallback = function( params ) {
+
+            const attributes = {
+                'default_product_id': params.newProps.product.id
+            };
+
+            EcwidGutenbergParams.products[params.newProps.product.id] = {
+                name: params.newProps.product.name,
+                imageUrl: params.newProps.product.thumb
+            };
+
+            params.originalProps.setAttributes(attributes);
+        };
+
+        function openEcwidProductPopup( props ) {
+            ecwid_open_product_popup( { 'saveCallback': saveCallback, 'props': props } );
+        }
+
+        const editor =
+            <EcwidProductBrowserBlock icon={ EcwidIcons.product } title={ __( 'Product Card Large', 'ecwid-shopping-cart' ) }>
+                <EcwidImage src="product-page-preview.png" />
+                { !attributes.default_product_id &&
+
+                    <div className="button-container">
+                        <button className="button ec-store-block-button" onClick={ () => { var params = {'saveCallback':saveCallback, 'props': props}; ecwid_open_product_popup( params ); } }>{ EcwidGutenbergParams.chooseProduct }</button>
+                    </div>
+                }
+            </EcwidProductBrowserBlock>;
+
+        function buildDangerousHTMLMessageWithTitle( title, message ) {
+            return <BaseControl label={ title }><div dangerouslySetInnerHTML={{ __html: message }} /></BaseControl>;
+        }
+
+        const productMigrationWarning = buildDangerousHTMLMessageWithTitle(
+            '',
+            __( 'To improve the look and feel of your store and manage your storefront appearance here, please enable the “Next-gen look and feel of the product list on the storefront” option in your store dashboard (“<a href="admin.php?page=ec-store&ec-store-page=whatsnew">Settings → What’s New</a>”).', 'ecwid-shopping-cart' )
+        );  
+
+        const productDetailsMigrationWarning = buildDangerousHTMLMessageWithTitle(
+            '',
+            __( 'To improve the look and feel of your product page and manage your its appearance here, please enable the “Next-gen look and feel of the product page on the storefront” option in your store dashboard (“<a href="admin.php?page=ec-store&ec-store-page=whatsnew">Settings → What’s New</a>”).', 'ecwid-shopping-cart' )
+        );
+
+        const isNewDetailsPage = blockParams.isNewDetailsPage;
+        
+        const controls = EcwidControls(blockParams.attributes, props);
+
+        return ([
+            editor,
+            <InspectorControls>
+                {attributes.default_product_id > 0 &&
+                <div>
+                    <div className="ec-store-inspector-row">
+                        <label className="ec-store-inspector-subheader">{ __( 'Linked product', 'ecwid-shopping-cart' ) }</label>
+                    </div>
+
+                    <div className="ec-store-inspector-row">
+
+                        { EcwidGutenbergParams.products && EcwidGutenbergParams.products[attributes.default_product_id] &&
+                        <label>{ EcwidGutenbergParams.products[attributes.default_product_id].name }</label>
+                        }
+
+                        <button className="button" onClick={ () => openEcwidProductPopup( props ) }>{ __( 'Change', 'ecwid-shopping-cart' ) }</button>
+                    </div>
+                </div>
+                }
+                {!attributes.default_product_id &&
+                <div className="ec-store-inspector-row">
+                    <button className="button" onClick={ () => openEcwidProductPopup( props ) }>{ __( 'Choose product', 'ecwid-shopping-cart' ) }</button>
+                </div>
+                }
+
+                <PanelBody title={ __( 'Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { isNewDetailsPage &&
+                    [
+                        controls.select('product_details_layout'),
+                        ( attributes.product_details_layout === 'TWO_COLUMNS_SIDEBAR_ON_THE_RIGHT'
+                        || attributes.product_details_layout === 'TWO_COLUMNS_SIDEBAR_ON_THE_LEFT' ) &&
+                        controls.toggle('show_description_under_image'),
+                        controls.toolbar('product_details_gallery_layout'),
+                        EcwidInspectorSubheader( __('Product sidebar content', 'ecwid-shopping-cart') ),
+                        controls.toggle('product_details_show_product_name'),
+                        controls.toggle('product_details_show_breadcrumbs'),
+                        controls.toggle('product_details_show_product_sku'),
+                        controls.toggle('product_details_show_product_price'),
+                        controls.toggle('product_details_show_qty'),
+                        controls.toggle('product_details_show_number_of_items_in_stock'),
+                        controls.toggle('product_details_show_in_stock_label'),
+                        controls.toggle('product_details_show_wholesale_prices'),
+                        controls.toggle('product_details_show_share_buttons'),
+                    ]
+                    }
+                    { !isNewDetailsPage && productMigrationWarning }
+                </PanelBody>
+                <PanelBody title={ __( 'Color settings', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { controls.color( 'chameleon_color_button' ) }
+                    { controls.color( 'chameleon_color_foreground' ) }
+                    { controls.color( 'chameleon_color_price' ) }
+                    { controls.color( 'chameleon_color_link' ) }
+                    { controls.color( 'chameleon_color_background' ) }
+                </PanelBody>
+            </InspectorControls>
+        ]);
+    },
+
+    save: function( props ) {
+        return null;
+    }
+} );
diff --git a/js/gutenberg/product.jsx b/js/gutenberg/product.jsx
new file mode 100644
index 00000000..6638e4d8
--- /dev/null
+++ b/js/gutenberg/product.jsx
@@ -0,0 +1,190 @@
+/**
+ * BLOCK: my-block
+ *
+ * Registering a basic block with Gutenberg.
+ * Simple block, renders and saves the same content without any interactivity.
+ */
+
+
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+
+if ( !EcwidGutenbergParams.isDemoStore ) {
+
+const { __, _x } = wp.i18n; // Import __() from wp.i18n
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+const {
+    InspectorControls,
+} = wp.editor;
+
+const {
+    PanelBody,
+	ToggleControl,
+} = wp.components;
+
+const { withState } = wp.compose;
+
+const {
+    Fragment
+} = wp.element;
+
+
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ecwid/product-block', {
+	title: __( 'Product Card Small', 'ecwid-shopping-cart' ), // Block title.
+	icon: EcwidIcons.product, 
+	category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+    attributes: {
+        id: {type: 'integer'},
+        show_picture: {type: 'boolean', default: true},
+        show_title: {type: 'boolean', default: true},
+        show_price: {type: 'boolean', default: true},
+        show_options: {type: 'boolean', default: true},
+        show_qty: {type: 'boolean', default: false},
+        show_addtobag: {type: 'boolean', default: true},
+        show_price_on_button: {type: 'boolean', default: true},
+        show_border: {type: 'boolean', default: true},
+        center_align: {type: 'boolean', default: true}
+    },
+	description: __( 'Display product with a buy button', 'ecwid-shopping-cart' ),
+    alignWide: false,
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+        align: true,
+		isPrivate: !EcwidGutenbergParams.isApiAvailable
+    },
+
+	/**
+	 * The edit function describes the structure of your block in the context of the editor.
+	 * This represents what the editor will render when the block is used.
+	 *
+	 * The "edit" property must be a valid function.
+	 *
+	 * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+	 */
+	edit: function( props ) {
+        
+        const { attributes } = props;
+		
+        const saveCallback = function( params ) {
+
+            const attributes = {
+                'id': params.newProps.product.id
+            };
+			
+            EcwidGutenbergParams.products[params.newProps.product.id] = {
+            	name: params.newProps.product.name,
+				imageUrl: params.newProps.product.thumb
+			};
+            
+            params.originalProps.setAttributes(attributes);
+        }
+		
+        const editor = <div className="ec-store-block ec-store-block-product">
+			{ EcwidGutenbergParams.products && attributes.id && EcwidGutenbergParams.products[attributes.id] &&
+			<div className="ec-store-block-image">
+				<img src={ EcwidGutenbergParams.products[attributes.id].imageUrl }/>
+			</div>
+            }
+            
+			{ EcwidGutenbergParams.products && attributes.id && EcwidGutenbergParams.products[attributes.id] &&
+			<div className="ec-store-product-title">
+				{ EcwidGutenbergParams.products[attributes.id].name }
+			</div>
+            }
+
+            { !attributes.id &&
+            <div className="ec-store-block-product-preview">
+                { EcwidIcons.productPreview }
+            </div>
+            }
+            
+            { !attributes.id && 
+            <div>
+                <button className="button ec-store-block-button" onClick={ () => { var params = {'saveCallback':saveCallback, 'props': props}; ecwid_open_product_popup( params ); } }>{ EcwidGutenbergParams.chooseProduct }</button> 
+            </div>
+            }
+			
+		</div>;
+
+        function buildToggle(props, name, label) {
+            return <ToggleControl
+				label={ label }
+				checked={ props.attributes[name] }
+				onChange={ () => props.setAttributes( { [name]: ! props.attributes[name] } ) }
+			/>
+        }
+
+        function openEcwidProductPopup( props ) {
+        	ecwid_open_product_popup( { 'saveCallback': saveCallback, 'props': props } );
+		}
+        
+        return ([
+        	editor, 
+			<InspectorControls>
+
+                { attributes.id && 
+                    <div>
+                        <div className="ec-store-inspector-row">
+                            <label className="ec-store-inspector-subheader">{ __( 'Displayed product', 'ecwid-shopping-cart' ) }</label>
+                        </div>
+                        <div className="ec-store-inspector-row">
+                            
+                            { EcwidGutenbergParams.products && EcwidGutenbergParams.products[attributes.id] &&
+                                <label>{ EcwidGutenbergParams.products[attributes.id].name }</label>
+                            }
+                            
+                            <button className="button" onClick={ () => openEcwidProductPopup( props ) }>{ __( 'Change', 'ecwid-shopping-cart' ) }</button>
+                        </div>
+                    </div>
+                }
+                {!attributes.id &&
+				<div className="ec-store-inspector-row">
+					<button className="button" onClick={ () => openEcwidProductPopup( props ) }>{ __( 'Choose product', 'ecwid-shopping-cart' ) }</button>
+				</div>
+                }
+                <PanelBody title={ _x( 'Content', 'gutenberg-product-block', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { buildToggle( props, 'show_picture', __( 'Picture', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'show_title', __( 'Title', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'show_price', __( 'Price', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'show_options', __( 'Options', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'show_qty', __( 'Quantity', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'show_addtobag', __( '«Buy now» button', 'ecwid-shopping-cart' ) ) }
+				</PanelBody>
+
+				<PanelBody title={ __( 'Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { buildToggle( props, 'show_price_on_button', __( 'Show price inside the «Buy now» button', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'show_border', __( 'Add border', 'ecwid-shopping-cart' ) ) }
+                    { buildToggle( props, 'center_align', __( 'Center align on a page', 'ecwid-shopping-cart' ) ) }
+				</PanelBody>
+			</InspectorControls>
+        ]); 
+	},
+
+	save: function( props ) {
+        return false;
+    },
+    
+} );
+
+}
\ No newline at end of file
diff --git a/js/gutenberg/search.jsx b/js/gutenberg/search.jsx
new file mode 100644
index 00000000..21ed1edd
--- /dev/null
+++ b/js/gutenberg/search.jsx
@@ -0,0 +1,66 @@
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+
+if ( !EcwidGutenbergParams.isDemoStore ) {
+
+const { __, _x } = wp.i18n; // Import __() from wp.i18n
+
+const {
+    registerBlockType,
+} = wp.blocks;
+	
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ec-store/search', {
+	title: __( 'Product Search Box', 'ecwid-shopping-cart' ),
+	icon: EcwidIcons.search, 
+	category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+	description: __( 'Display search box', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+		isPrivate: !EcwidGutenbergParams.isApiAvailable
+    },
+
+	/**
+	 * The edit function describes the structure of your block in the context of the editor.
+	 * This represents what the editor will render when the block is used.
+	 *
+	 * The "edit" property must be a valid function.
+	 *
+	 * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+	 */
+	edit: function( props ) {
+        
+        const { attributes } = props;
+		
+        const editor = <div className="ec-store-block ec-store-block-search">
+			<div class="image"></div>
+		</div>;
+        
+        return ([
+        	editor
+        ]); 
+	},
+
+	save: function( props ) {
+        return false;
+    },
+    
+} );
+
+}
\ No newline at end of file
diff --git a/js/gutenberg/store.jsx b/js/gutenberg/store.jsx
new file mode 100644
index 00000000..1c63ec42
--- /dev/null
+++ b/js/gutenberg/store.jsx
@@ -0,0 +1,327 @@
+/**
+ * BLOCK: my-block
+ *
+ * Registering a basic block with Gutenberg.
+ * Simple block, renders and saves the same content without any interactivity.
+ */
+
+//  Import CSS.
+import './style.scss';
+import './editor.scss';
+import {EcwidIcons} from '../icons.js';
+import { EcwidControls, EcwidInspectorSubheader, EcwidProductBrowserBlock } from '../includes/controls.js';
+
+const { __, _x } = wp.i18n;
+
+const {
+    registerBlockType,
+} = wp.blocks;
+
+const {
+    InspectorControls,
+} = wp.editor;
+
+const {
+    PanelBody,
+    PanelRow,
+	ToggleControl,
+	ButtonGroup,
+	Button,
+	BaseControl,
+	Toolbar,
+    ColorPalette,
+    ColorIndicator
+} = wp.components;
+
+const { withState } = wp.compose;
+
+const blockName = 'ecwid/store-block';
+
+const blockParams = EcwidGutenbergParams.blockParams[blockName];
+/**
+ * Register: aa Gutenberg Block.
+ *
+ * Registers a new block provided a unique name and an object defining its
+ * behavior. Once registered, the block is made editor as an option to any
+ * editor interface where blocks are implemented.
+ *
+ * @link https://wordpress.org/gutenberg/handbook/block-api/
+ * @param  {string}   name     Block name.
+ * @param  {Object}   settings Block settings.
+ * @return {?WPBlock}          The block, if it has been successfully
+ *                             registered; otherwise `undefined`.
+ */
+registerBlockType( 'ecwid/store-block', {
+	title: __( 'Store Home Page', 'ecwid-shopping-cart' ), // Block title.
+	icon: EcwidIcons.store, 
+	category: 'ec-store', // Block category — Group blocks together based on common traits E.g. common, formatting, layout widgets, embed.
+    attributes: blockParams.attributes,
+	description: __( 'Add storefront (product listing)', 'ecwid-shopping-cart' ),
+    supports: {
+        customClassName: false,
+        className: false,
+        html: false,
+        multiple: false
+    },
+
+	/**
+	 * The edit function describes the structure of your block in the context of the editor.
+	 * This represents what the editor will render when the block is used.
+	 *
+	 * The "edit" property must be a valid function.
+	 *
+	 * @link https://wordpress.org/gutenberg/handbook/block-api/block-edit-save/
+	 */
+	edit: function( props ) {
+		
+		const { attributes } = props;
+		
+		// legacy reset 
+        props.setAttributes({widgets:''});
+        
+		const editor =
+            <EcwidProductBrowserBlock icon={ EcwidIcons.store } title={ __( 'Store Home Page', 'ecwid-shopping-cart') } showDemoButton={ blockParams.isDemoStore }>
+                <div className="ec-store-products">
+                    <div className="ec-store-product1"></div>
+                    <div className="ec-store-product2"></div>
+                    <div className="ec-store-product3"></div>
+                </div>
+                <div className="ec-store-products">
+                    <div className="ec-store-product4"></div>
+                    <div className="ec-store-product5"></div>
+                    <div className="ec-store-product6"></div>
+                </div>
+            </EcwidProductBrowserBlock>;
+       
+        function buildDangerousHTMLMessageWithTitle( title, message ) {
+            return <BaseControl label={ title }><div dangerouslySetInnerHTML={{ __html: message }} /></BaseControl>;
+        }
+
+		const productMigrationWarning = buildDangerousHTMLMessageWithTitle(
+			'',
+			__( 'To improve the look and feel of your store and manage your storefront appearance here, please enable the “Next-gen look and feel of the product list on the storefront” option in your store dashboard (“<a href="admin.php?page=ec-store&ec-store-page=whatsnew">Settings → What’s New</a>”).', 'ecwid-shopping-cart' )
+		);
+        
+        const cartIconMessage = buildDangerousHTMLMessageWithTitle(
+        	__( 'Display cart icon', 'ecwid-shopping-cart' ),
+            blockParams.customizeMinicartText
+		);
+        
+        const productDetailsMigrationWarning = buildDangerousHTMLMessageWithTitle(
+            '',
+            __( 'To improve the look and feel of your product page and manage its appearance here, please enable the “Next-gen look and feel of the product page on the storefront” option in your store dashboard (“<a href="admin.php?page=ec-store&ec-store-page=whatsnew">Settings → What’s New</a>”).', 'ecwid-shopping-cart' )
+        );
+		
+		const isNewProductList = blockParams.isNewProductList;
+        const isNewDetailsPage = blockParams.isNewDetailsPage;
+        
+        const hasCategories = blockParams.attributes.default_category_id && blockParams.attributes.default_category_id.values && blockParams.attributes.default_category_id.values.length > 0;
+        
+        const controls = EcwidControls(blockParams.attributes, props);
+        
+        return ([
+        	editor, 
+			<InspectorControls>
+                { hasCategories &&
+                <PanelBody title={ __('Category List Appearance', 'ecwid-shopping-cart') } initialOpen={false}>
+                    { isNewProductList && 
+                        [
+                            controls.select('product_list_category_title_behavior'),
+                            attributes.product_list_category_title_behavior !== 'SHOW_TEXT_ONLY' &&
+                            [
+                                controls.buttonGroup('product_list_category_image_size'),
+                                controls.toolbar('product_list_category_image_aspect_ratio'),
+                            ]
+                        ]
+                    }
+                    { !isNewProductList && productMigrationWarning }
+                </PanelBody>
+                }
+                
+                <PanelBody title={ __( 'Product List Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                { isNewProductList &&
+                [
+                    controls.toggle( 'product_list_show_product_images' ),
+                    attributes.product_list_show_product_images && [
+                        controls.buttonGroup( 'product_list_image_size' ),
+                        controls.toolbar( 'product_list_image_aspect_ratio' )
+                    ],
+                    controls.toolbar( 'product_list_product_info_layout' ),
+                    controls.select( 'product_list_title_behavior' ),
+                    controls.select( 'product_list_price_behavior' ),
+                    controls.select( 'product_list_sku_behavior' ),
+                    controls.select( 'product_list_buybutton_behavior' ),
+                    controls.toggle( 'product_list_show_additional_image_on_hover' ),
+                    controls.toggle( 'product_list_show_frame' )
+                ]
+                }
+                { !isNewProductList && productMigrationWarning }
+                </PanelBody>
+
+                <PanelBody title={ __( 'Product Page Appearance', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { isNewDetailsPage &&
+                    [
+                        controls.select('product_details_layout'),
+                        ( attributes.product_details_layout === 'TWO_COLUMNS_SIDEBAR_ON_THE_RIGHT'
+                        || attributes.product_details_layout === 'TWO_COLUMNS_SIDEBAR_ON_THE_LEFT' ) &&
+                        controls.toggle('show_description_under_image'),
+                        controls.toolbar('product_details_gallery_layout'),
+                        EcwidInspectorSubheader( __('Product sidebar content', 'ecwid-shopping-cart') ),
+                        controls.toggle('product_details_show_product_name'),
+                        controls.toggle('product_details_show_breadcrumbs'),
+                        controls.toggle('product_details_show_product_sku'),
+                        controls.toggle('product_details_show_product_price'),
+                        controls.toggle('product_details_show_qty'),
+                        controls.toggle('product_details_show_number_of_items_in_stock'),
+                        controls.toggle('product_details_show_in_stock_label'),
+                        controls.toggle('product_details_show_wholesale_prices'),
+                        controls.toggle('product_details_show_share_buttons'),
+                    ]
+                    }
+                    { !isNewDetailsPage && productMigrationWarning }
+                </PanelBody>
+                
+                { hasCategories &&
+  
+                <PanelBody title={ __('Store Front Page', 'ecwid-shopping-cart') } initialOpen={false}>
+                    { controls.defaultCategoryId( 'default_category_id' ) }
+                </PanelBody>
+  
+                }
+                <PanelBody title={ __( 'Store Navigation', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { controls.toggle( 'show_categories') }
+                    { controls.toggle( 'show_search') }
+                    { controls.toggle( 'show_breadcrumbs') }
+                    { isNewProductList && controls.toggle( 'show_footer_menu' ) }
+                    { controls.toggle( 'show_signin_link') }
+                    { controls.toggle( 'product_list_show_sort_viewas_options') }
+                    { cartIconMessage }
+                </PanelBody>
+                <PanelBody title={ __( 'Color settings', 'ecwid-shopping-cart' ) } initialOpen={false}>
+                    { controls.color( 'chameleon_color_button' ) }
+                    { controls.color( 'chameleon_color_foreground' ) }
+                    { controls.color( 'chameleon_color_price' ) }
+                    { controls.color( 'chameleon_color_link' ) }
+                    { controls.color( 'chameleon_color_background' ) }
+                </PanelBody>
+			</InspectorControls>
+        ]); 
+	},
+
+	save: function( props ) {
+	    
+	    var widgets = ['productbrowser'];
+	    if ( props.attributes.show_categories ) {
+	        widgets[widgets.length] = 'categories';    
+        }
+        if ( props.attributes.show_search ) {
+            widgets[widgets.length] = 'search';
+        }
+        const shortcodeAttributes = {
+            'widgets': widgets.join(' '),
+            'default_category_id': typeof props.attributes.default_category_id !== 'undefined' ? props.attributes.default_category_id  : 0
+	    };
+
+        const shortcode = new wp.shortcode({
+            'tag': blockParams.shortcodeName,
+            'attrs': shortcodeAttributes,
+            'type': 'single'
+        });
+
+        return shortcode.string();	
+    },
+
+    deprecated: [
+        {
+            attributes: {
+                widgets: { type: 'string' },
+                categories_per_row: { type: 'integer' },
+                grid: { type: 'string' },
+                list: { type: 'integer' },
+                table: { type: 'integer' },
+                default_category_id: { type: 'integer' },
+                default_product_id: { type: 'integer' },
+                category_view: { type: 'string' },
+                search_view: { type: 'string' },
+                minicart_layout: {type: 'string' }
+            },
+
+            save: function( props ) {
+                return null;
+            },
+        }, {
+            attributes: {
+                widgets: { type: 'string', default: 'productbrowser' },
+                default_category_id: { type: 'integer', default: 0 }
+            },
+            
+            migrate: function ( attributes ) {
+                return {
+                    'widgets': attributes.widgets,
+                    'default_category_id': attributes.default_category_id
+                }
+            },
+            
+            save: function( props ) {
+                var shortcodeAttributes = {};
+                const attrs = ['widgets', 'default_category_id'];
+                for ( var i = 0; i < attrs.length; i++ ) {
+                    shortcodeAttributes[attrs[i]] = props.attributes[attrs[i]];
+                }
+                shortcodeAttributes.default_product_id = 0;
+
+                var shortcode = new wp.shortcode({
+                    'tag': blockParams.shortcodeName,
+                    'attrs': shortcodeAttributes,
+                    'type': 'single'
+                });
+                
+                return shortcode.string();
+            },    
+        },
+        {
+            save: function( props ) {
+                return '[ecwid]';
+            },
+        },
+        {
+            save: function( props ) {
+                return '[ecwid widgets="productbrowser" default_category_id="0" default_product_id="0"]';
+            },
+        },
+        {
+            save: function( props ) {
+                return '[ecwid widgets="productbrowser" default_category_id="0"]';
+            },
+        },
+    ],
+	
+    transforms: {
+        from: [{
+            type: 'shortcode',
+            tag: ['ecwid', 'ec_store'],
+            attributes: {
+                default_category_id: {
+                    type: 'integer',
+                    shortcode: function(named) {
+                        return named.default_category_id
+                    }
+                },
+                show_categories: {
+                    type: 'boolean',
+                    shortcode: function(attributes) {
+                        return attributes.named.widgets.indexOf('categories') !== -1
+                    }
+                },
+                show_search: {
+                    type: 'boolean',
+                    shortcode: function(attributes) {
+                        return attributes.named.widgets.indexOf('search') !== -1
+                    }
+                }
+            },
+            priority: 10
+        }]
+    },
+
+} );
diff --git a/lib/ecwid_catalog_entry.php b/lib/ecwid_catalog_entry.php
index 76a6cc32..4869c168 100644
--- a/lib/ecwid_catalog_entry.php
+++ b/lib/ecwid_catalog_entry.php
@@ -12,7 +12,7 @@ protected function __construct() {
 
 	public function __get( $name ) {
 
-		if ( $name == 'link' ) {
+		if ( $name === 'link' ) {
 			return $this->get_link();
 		}
 
@@ -25,7 +25,7 @@ public function __get( $name ) {
 
 	public function __isset( $name ) {
 
-		if ( $name == 'link' ) {
+		if ( $name === 'link' ) {
 			$link = $this->get_link();
 			return (bool) $link;
 		}
@@ -73,7 +73,6 @@ public function get_link( $baseUrl = false ) {
 
 	public function get_seo_link( $baseUrl = '' ) {
 		if ( $this->_data->id && isset( $this->_data->name ) ) {
-
 			if ( ! $baseUrl ) {
 				if ( Ecwid_Store_Page::is_store_page() ) {
 					$baseUrl = get_permalink();
@@ -93,9 +92,7 @@ public function get_seo_link( $baseUrl = '' ) {
 				$url .= '/';
 			}
 
-			preg_match( '!([^\/]+-[p|c][0-9]+)$!', $this->_data->url, $slug );
-
-			if( ! empty( $slug[1] ) ) {
+			if ( ! empty( $this->_data->url ) && preg_match( '!([^\/]+-[p|c][0-9]+)$!', $this->_data->url, $slug ) ) {
 				$url .= $slug[1];
 			} else {
 				$url .= $this->_linkify( $this->_data->name ) . '-' . $this->_link_prefix . $this->_data->id;
diff --git a/readme.txt b/readme.txt
index 1fc58360..4e9e7281 100644
--- a/readme.txt
+++ b/readme.txt
@@ -5,7 +5,7 @@ License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 Requires at least: 4.4
 Tested up to: 6.8
-Stable tag: 7.0.3
+Stable tag: 7.0.4
 
 Powerful, easy to use ecommerce shopping cart for WordPress. Sell on Facebook and Instagram. iPhone & Android apps. Superb support.
 
@@ -56,16 +56,16 @@ There is a lot of in-house and third party extensions built on the Ecwid Ecommer
 
 ### Plans start at just $5/mo
 
-Start selling ealisy with no big investment. As your online shop grows, Ecwid grows with you. When the time is right, consider upgrading your store to one of our premium plans to get more robust features and preferred support. See also: [Ecwid plan and pricing](https://ecwid.to/ecwid-pricing)
+Start selling ealisy with no big investment. As your online shop grows, Ecwid grows with you. When the time is right, consider upgrading your store to one of our premium plans to get more robust features and preferred support. See also: [Ecwid plan and pricing](https://go.lightspeedhq.com/ecwid-pricing)
 
 ### See Ecwid In Action
 
-* [Ecwid Ecommerce Control panel](https://ecwid.to/ecwid-store-control-panel "Ecwid Control Panel") (you will be able to create an Ecwid account)
-* [Showcase](https://ecwid.to/ecwid-wp-site)
+* [Ecwid Ecommerce Control panel](https://go.lightspeedhq.com/ecwid-store-control-panel "Ecwid Control Panel") (you will be able to create an Ecwid account)
+* [Showcase](https://go.lightspeedhq.com/ecwid-wp-site)
 
 ### Ecwid Site
 
-* [www.ecwid.com](https://ecwid.to/ecwid-wp-site "Ecwid site")
+* [www.ecwid.com](https://go.lightspeedhq.com/ecwid-wp-site "Ecwid site")
 
 ### Terms of usage
 
@@ -123,7 +123,7 @@ Ecwid is PCI DSS Level 1 certified shopping cart plugin – the gold standard fo
 
 = How much does Ecwid cost? =
 
-Ecwid shopping cart plans vary by number of products, types of ecommerce functionality, and level of support. Learn more: [https://ecwid.to/ecwid-pricing](https://ecwid.to/ecwid-pricing).
+Ecwid shopping cart plans vary by number of products, types of ecommerce functionality, and level of support. Learn more: [https://go.lightspeedhq.com/ecwid-pricing](https://go.lightspeedhq.com/ecwid-pricing).
 
 = How can I manage my online shop from a mobile device? =
 
@@ -152,6 +152,10 @@ You can use Ecwid’s built-in import tools to copy your store products from any
 * [Ecwid Help Center](http://help.ecwid.com "Ecwid Help")
 
 == Changelog ==
+= 7.0.4 - Jul 15, 2025 =
+- Improved compatibility with the Jetpack plugin to ensure storefront scripts load correctly when 'Defer Non-Essential JavaScript' is enabled.
+- Applied minor fixes and general improvements for better performance and stability.
+
 = 7.0.3 - Jun 24, 2025 =
 - Internal improvements and minor fixes for Gutenberg ecommerce blocks.
 
diff --git a/templates/debug.php b/templates/debug.php
index afb2aa0a..2023ec7b 100644
--- a/templates/debug.php
+++ b/templates/debug.php
@@ -225,7 +225,7 @@
 
 </div>
 
-<script>
+<scrip data-cfasync="false" data-no-optimize="1"t>
 	jQuery('h2').click(function() {
 		jQuery(this).toggleClass('hide');
 	})
diff --git a/templates/help.php b/templates/help.php
index c1c35e46..e4aaa0d3 100644
--- a/templates/help.php
+++ b/templates/help.php
@@ -84,7 +84,7 @@
 
 		</div>
 
-		<script>
+		<script data-cfasync="false" data-no-optimize="1">
 			(function() {
 				Element.prototype.addClass = function(c) {
 					var re = new RegExp("(^|\\s)" + c + "(\\s|$)", "g");
diff --git a/templates/product.php b/templates/product.php
index 4595e2f1..d87653a1 100644
--- a/templates/product.php
+++ b/templates/product.php
@@ -1,3 +1,3 @@
 <?php
-$content = "<script>xProductBrowser('defaultProductId=$ecwid_id');</script>";
+$content = "<script data-cfasync='false' data-no-optimize='1'>xProductBrowser('defaultProductId=$ecwid_id');</script>";
 echo ecwid_wrap_shortcode_content( $content, 'product', array() ); //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
diff --git a/templates/store-popup.php b/templates/store-popup.php
index e803fce5..82ca7b2a 100644
--- a/templates/store-popup.php
+++ b/templates/store-popup.php
@@ -299,7 +299,7 @@ class="number"
 	<div class="media-modal-backdrop"></div>
 </div>
 <?php if ( get_option( 'ecwid_hide_old_minicart' ) ) : ?>
-<script>    
+<script data-cfasync="false" data-no-optimize="1">
 	jQuery('.ecwid-store-editor path.minicart').hide();
 </script>
 <?php endif; ?>
diff --git a/templates/sync.php b/templates/sync.php
index 77b2d767..15c1daf6 100644
--- a/templates/sync.php
+++ b/templates/sync.php
@@ -5,7 +5,7 @@
 $api   = new Ecwid_Api_V3( get_ecwid_store_id() );
 ?>
 
-<script>
+<script data-cfasync="false" data-no-optimize="1">
 jQuery(document).ready(function() {
 
 jQuery('#sync-container').addClass('no-sse');