diff --git a/includes/vendor/amp/includes/class-amp-post-template.php b/includes/vendor/amp/includes/class-amp-post-template.php
index b243eba4c..710174f88 100644
--- a/includes/vendor/amp/includes/class-amp-post-template.php
+++ b/includes/vendor/amp/includes/class-amp-post-template.php
@@ -19,6 +19,8 @@
 require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-allowed-tags-generated.php' );
 require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-tag-and-attribute-sanitizer.php' );
 require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-gallery-block-sanitizer.php' );
+require_once( AMP__VENDOR__DIR__ . '/includes/sanitizers/class-amp-block-sanitizer.php' );
+
 require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-twitter-embed.php' );
 require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-youtube-embed.php' );
 require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-dailymotion-embed.php' );
@@ -30,6 +32,7 @@
 require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-soundcloud-embed.php' );
 require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-pinterest-embed.php' );
 require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-wistia-embed.php' );
+require_once( AMP__VENDOR__DIR__ . '/includes/embeds/class-amp-core-block-handler.php' );
 
 class AMP_Post_Template {
 	const SITE_ICON_SIZE = 32;
@@ -262,6 +265,7 @@ private function build_post_content() {
 
 			$amp_content = new AMP_Content( $new_post_content,
 				apply_filters( 'amp_content_embed_handlers', array(
+					'AMP_Core_Block_Handler' => array(),
 					'AMP_Twitter_Embed_Handler' => array(),
 					'AMP_YouTube_Embed_Handler' => array(),
 					'AMP_DailyMotion_Embed_Handler' => array(),
@@ -285,6 +289,7 @@ private function build_post_content() {
 					 'AMP_Iframe_Sanitizer' => array(
 						 'add_placeholder' => true,
 					 ),
+					 'AMP_Block_Sanitizer' => array(),
 				), $this->post ),
 				array(
 					'content_max_width' => $this->get( 'content_max_width' ),
diff --git a/includes/vendor/amp/includes/embeds/class-amp-core-block-handler.php b/includes/vendor/amp/includes/embeds/class-amp-core-block-handler.php
new file mode 100644
index 000000000..0a671dc7d
--- /dev/null
+++ b/includes/vendor/amp/includes/embeds/class-amp-core-block-handler.php
@@ -0,0 +1,117 @@
+<?php
+namespace AMPforWP\AMPVendor;
+/**
+ * Class AMP_Core_Block_Handler
+ *
+ */
+
+/**
+ * Class AMP_Core_Block_Handler
+ *
+ * @since 1.0
+ */
+class AMP_Core_Block_Handler extends AMP_Base_Embed_Handler {
+
+	/**
+	 * Original block callback.
+	 *
+	 * @var array
+	 */
+	public $original_categories_callback;
+
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	public $block_name = 'core/categories';
+
+	/**
+	 * Register embed.
+	 */
+	public function register_embed() {
+		if ( class_exists( 'WP_Block_Type_Registry' ) ) {
+			$registry = \WP_Block_Type_Registry::get_instance();
+			$block    = $registry->get_registered( $this->block_name );
+
+			if ( $block ) {
+				$this->original_categories_callback = $block->render_callback;
+				$block->render_callback             = array( $this, 'render' );
+			}
+		}
+	}
+
+	/**
+	 * Unregister embed.
+	 */
+	public function unregister_embed() {
+		if ( class_exists( 'WP_Block_Type_Registry' ) ) {
+			$registry = \WP_Block_Type_Registry::get_instance();
+			$block    = $registry->get_registered( $this->block_name );
+
+			if ( $block && ! empty( $this->original_categories_callback ) ) {
+				$block->render_callback             = $this->original_categories_callback;
+				$this->original_categories_callback = null;
+			}
+		}
+	}
+
+	/**
+	 * Render Gutenberg block. This is essentially the same method as the original.
+	 * Difference is excluding the disallowed JS script, adding <form> tags, and using on:change for <select>.
+	 *
+	 * @param array $attributes Attributes.
+	 * @return string Rendered.
+	 */
+	public function render( $attributes ) {
+		static $block_id = 0;
+		$block_id++;
+
+		$align = 'center';
+		if ( isset( $attributes['align'] ) && in_array( $attributes['align'], array( 'left', 'right', 'full' ), true ) ) {
+			$align = $attributes['align'];
+		}
+
+		$args = array(
+			'echo'         => false,
+			'hierarchical' => ! empty( $attributes['showHierarchy'] ),
+			'orderby'      => 'name',
+			'show_count'   => ! empty( $attributes['showPostCounts'] ),
+			'title_li'     => '',
+		);
+
+		if ( ! empty( $attributes['displayAsDropdown'] ) ) {
+			$id                       = 'wp-block-categories-dropdown-' . $block_id;
+			$form_id                  = $id . '-form';
+			$args['id']               = $id;
+			$args['show_option_none'] = __( 'Select Category', 'amp' );
+			$wrapper_markup           = '<div class="%1$s">%2$s</div>';
+			$items_markup             = wp_dropdown_categories( $args );
+			$type                     = 'dropdown';
+
+			$items_markup = preg_replace(
+				'/(?<=<select\b)/',
+				sprintf( ' on="change:%s.submit"', esc_attr( $form_id ) ),
+				$items_markup,
+				1
+			);
+		} else {
+			$wrapper_markup = '<div class="%1$s"><ul>%2$s</ul></div>';
+			$items_markup   = wp_list_categories( $args );
+			$type           = 'list';
+		}
+
+		$class = "wp-block-categories wp-block-categories-{$type} align{$align}";
+
+		$block_content = sprintf(
+			$wrapper_markup,
+			esc_attr( $class ),
+			$items_markup
+		);
+
+		if ( ! empty( $attributes['displayAsDropdown'] ) ) {
+			$block_content = sprintf( '<form action="%s" method="get" target="_top" id="%s">%s</form>', esc_url( home_url() ), esc_attr( $form_id ), $block_content );
+		}
+		return $block_content;
+	}
+}
diff --git a/includes/vendor/amp/includes/sanitizers/class-amp-base-sanitizer.php b/includes/vendor/amp/includes/sanitizers/class-amp-base-sanitizer.php
index c6c144774..b9f591bbf 100644
--- a/includes/vendor/amp/includes/sanitizers/class-amp-base-sanitizer.php
+++ b/includes/vendor/amp/includes/sanitizers/class-amp-base-sanitizer.php
@@ -8,6 +8,7 @@ abstract class AMP_Base_Sanitizer {
 	protected $dom;
 	protected $args;
 	protected $did_convert_elements = false;
+	const AMP_IMAGE_LIGHTBOX_ID = 'amp-image-lightbox';
 	/**
 	 * The root element used for sanitization. Either html or body.
 	 *
@@ -197,4 +198,24 @@ public function remove_invalid_attribute( $element, $attribute, $args = array()
 			}
 		}
 	}
+	/**
+	 * Add <amp-image-lightbox> element to body tag if it doesn't exist yet.
+	 */
+	public function maybe_add_amp_image_lightbox_node() {
+ 		$nodes = $this->dom->getElementById( self::AMP_IMAGE_LIGHTBOX_ID );
+		if ( null !== $nodes ) {
+			return;
+		}
+ 		$nodes = $this->dom->getElementsByTagName( 'body' );
+		if ( ! $nodes->length ) {
+			return;
+		}
+		$body_node          = $nodes->item( 0 );
+		$amp_image_lightbox = AMP_DOM_Utils::create_node( $this->dom, 'amp-image-lightbox', array(
+			'id'                           => self::AMP_IMAGE_LIGHTBOX_ID,
+			'layout'                       => 'nodisplay',
+			'data-close-button-aria-label' => esc_html__( 'Close', 'amp' ),
+		) );
+		$body_node->appendChild( $amp_image_lightbox );
+	}
 }
\ No newline at end of file
diff --git a/includes/vendor/amp/includes/sanitizers/class-amp-block-sanitizer.php b/includes/vendor/amp/includes/sanitizers/class-amp-block-sanitizer.php
new file mode 100644
index 000000000..015ba4c6d
--- /dev/null
+++ b/includes/vendor/amp/includes/sanitizers/class-amp-block-sanitizer.php
@@ -0,0 +1,133 @@
+<?php
+namespace AMPforWP\AMPVendor;
+/**
+ * Class AMP_Block_Sanitizer.
+ *
+ */
+
+/**
+ * Class AMP_Block_Sanitizer
+ *
+ * Modifies elements created as blocks to match the blocks' AMP-specific configuration.
+ */
+class AMP_Block_Sanitizer extends AMP_Base_Sanitizer {
+
+	/**
+	 * Tag.
+	 *
+	 * @var string Figure tag to identify wrapper around AMP elements.
+	 * @since 1.0
+	 */
+	public static $tag = 'figure';
+
+	/**
+	 * Sanitize the AMP elements contained by <figure> element where necessary.
+	 *
+	 * @since 0.2
+	 */
+	public function sanitize() {
+		$nodes     = $this->dom->getElementsByTagName( self::$tag );
+		$num_nodes = $nodes->length;
+		if ( 0 === $num_nodes ) {
+			return;
+		}
+
+		for ( $i = $num_nodes - 1; $i >= 0; $i-- ) {
+			$node = $nodes->item( $i );
+
+			// We're looking for <figure> elements that have one child node only.
+			if ( 1 !== count( $node->childNodes ) ) {
+				continue;
+			}
+
+			$attributes = AMP_DOM_Utils::get_node_attributes_as_assoc_array( $node );
+
+			// We are only looking for <figure> elements which have wp-block-embed as class.
+			if ( ! isset( $attributes['class'] ) || false === strpos( $attributes['class'], 'wp-block-embed' ) ) {
+				continue;
+			}
+
+			// We are looking for <figure> elements with layout attribute only.
+			if (
+				! isset( $attributes['data-amp-layout'] ) &&
+				! isset( $attributes['data-amp-noloading'] ) &&
+				! isset( $attributes['data-amp-lightbox'] )
+			) {
+				continue;
+			}
+
+			$amp_el_found = false;
+
+			foreach ( $node->childNodes as $child_node ) {
+
+				// We are looking for child elements which start with 'amp-'.
+				if ( 0 !== strpos( $child_node->tagName, 'amp-' ) ) {
+					continue;
+				}
+				$amp_el_found = true;
+
+				$this->set_attributes( $child_node, $node, $attributes );
+			}
+
+			if ( false === $amp_el_found ) {
+				continue;
+			}
+			$this->did_convert_elements = true;
+		}
+	}
+
+	/**
+	 * Sets necessary attributes to both parent and AMP element node.
+	 *
+	 * @param DOMNode $node AMP element node.
+	 * @param DOMNode $parent_node <figure> node.
+	 * @param array   $attributes Current attributes of the AMP element.
+	 */
+	protected function set_attributes( $node, $parent_node, $attributes ) {
+
+		if ( isset( $attributes['data-amp-layout'] ) ) {
+			$node->setAttribute( 'layout', $attributes['data-amp-layout'] );
+		}
+		if ( isset( $attributes['data-amp-noloading'] ) && true === filter_var( $attributes['data-amp-noloading'], FILTER_VALIDATE_BOOLEAN ) ) {
+			$node->setAttribute( 'noloading', '' );
+		}
+
+		$layout = $node->getAttribute( 'layout' );
+
+		// The width has to be unset / auto in case of fixed-height.
+		if ( 'fixed-height' === $layout ) {
+			if ( ! isset( $attributes['height'] ) ) {
+				$node->setAttribute( 'height', self::FALLBACK_HEIGHT );
+			}
+			$node->setAttribute( 'width', 'auto' );
+
+			$height = $node->getAttribute( 'height' );
+			if ( is_numeric( $height ) ) {
+				$height .= 'px';
+			}
+			$parent_node->setAttribute( 'style', "height: $height; width: auto;" );
+
+			// The parent element should have width/height set and position set in case of 'fill'.
+		} elseif ( 'fill' === $layout ) {
+			if ( ! isset( $attributes['height'] ) ) {
+				$attributes['height'] = self::FALLBACK_HEIGHT;
+			}
+			$parent_node->setAttribute( 'style', 'position:relative; width: 100%; height: ' . $attributes['height'] . 'px;' );
+			$node->removeAttribute( 'width' );
+			$node->removeAttribute( 'height' );
+		} elseif ( 'responsive' === $layout ) {
+			$parent_node->setAttribute( 'style', 'position:relative; width: 100%; height: auto' );
+		} elseif ( 'fixed' === $layout ) {
+			if ( ! isset( $attributes['height'] ) ) {
+				$node->setAttribute( 'height', self::FALLBACK_HEIGHT );
+			}
+		}
+
+		// Set the fallback layout in case needed.
+		$attributes = AMP_DOM_Utils::get_node_attributes_as_assoc_array( $node );
+		$attributes = $this->set_layout( $attributes );
+		if ( $layout !== $attributes['layout'] ) {
+			$node->setAttribute( 'layout', $attributes['layout'] );
+		}
+	}
+}
diff --git a/templates/design-manager/design-1/style.php b/templates/design-manager/design-1/style.php
index 4e6af405e..31f47a5b8 100644
--- a/templates/design-manager/design-1/style.php
+++ b/templates/design-manager/design-1/style.php
@@ -133,7 +133,7 @@
 .ampforwp-ad-above-related-post{padding-top:15px;}
 .single-post .amp_author_area amp-img{ margin: 0; float: left; margin-right: 12px; border-radius: 60px; }
 .single-post .amp_author_area .amp_author_area_wrapper{ display: inline-block; width: 100%; line-height: 1.4; margin-top: 22px; font-size: 13px; color:#333; font-family: sans-serif; }
-.wp-block-image.aligncenter amp-img {
+figure.aligncenter amp-img {
  margin: 0 auto;
  }
 /* Footer */
diff --git a/templates/design-manager/design-2/style.php b/templates/design-manager/design-2/style.php
index c88fc579c..ea5c20d71 100644
--- a/templates/design-manager/design-2/style.php
+++ b/templates/design-manager/design-2/style.php
@@ -44,7 +44,7 @@
     margin: 0 auto;
     <?php endif; ?>
 }
-.wp-block-image.aligncenter amp-img {
+figure.aligncenter amp-img {
  margin: 0 auto;
  }
 /* Slide Navigation code */
diff --git a/templates/design-manager/design-3/style.php b/templates/design-manager/design-3/style.php
index 8f7f63035..1c5ae540a 100644
--- a/templates/design-manager/design-3/style.php
+++ b/templates/design-manager/design-3/style.php
@@ -74,7 +74,7 @@
     margin: 0 auto;
     <?php endif; ?>
 }
-.wp-block-image.aligncenter amp-img {
+figure.aligncenter amp-img {
  margin: 0 auto;
  }
 /* Slide Navigation code */
diff --git a/templates/design-manager/swift/style.php b/templates/design-manager/swift/style.php
index 47c5aec93..bfa164264 100644
--- a/templates/design-manager/swift/style.php
+++ b/templates/design-manager/swift/style.php
@@ -58,7 +58,7 @@
 .amp-carousel-container {position: relative;width: 100%;height: 100%;} 
 .amp-carousel-img img {object-fit: contain;}
 amp-instagram{box-sizing: initial;}
-.wp-block-image.aligncenter amp-img {margin: 0 auto;}
+figure.aligncenter amp-img {margin: 0 auto;}
 <?php global $post;
 if( class_exists('\Elementor\Plugin') && \Elementor\Plugin::$instance->db->is_built_with_elementor($post->ID) &&  (is_page() || ampforwp_is_front_page() ) && ( function_exists( 'amp_pagebuilder_compatibility_init' ) || class_exists('Elementor_For_Amp') ) ) { }
 else{ ?>.cntr {max-width: 1100px;margin: 0 auto;width:100%;padding:0px 20px} <?php } ?>
diff --git a/templates/features.php b/templates/features.php
index 2e5bcd9e4..74c4a81c6 100644
--- a/templates/features.php
+++ b/templates/features.php
@@ -6481,6 +6481,9 @@ function ampforwp_sd_feature_image_guidlines($metadata){
 	function ampforwp_gutenberg_css(){ ?>
 		.wp-block-button { color: #fff}
 		.wp-block-button a {background-color: #32373c;border-radius: 28px;color: inherit;display: inline-block;padding: 12px 24px;}
+		.wp-block-cover{position:relative;background-color: #000;background-size: cover;background-position: center center;min-height: 430px;width: 100%;margin: 1.5em 0 1.5em 0;display: flex;justify-content: center;align-items: center;overflow: hidden;}
+		.wp-block-cover-text{color: #fff;font-size: 2em;line-height: 1.25;z-index: 1;}
+		.wp-block-cover-image.has-background-dim::before, .wp-block-cover.has-background-dim::before {content: "";position: absolute;top: 0;left: 0;bottom: 0;right: 0;background-color: inherit;opacity: .5;z-index: 1;}
 	<?php }
 } 
 // Subtitles Plugin Support #2853