diff --git a/.travis.yml b/.travis.yml
index c0b1791..8e74530 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,9 @@ cache:
   - "$HOME/.yarn"
   - "./node_modules"
 before_install:
+- composer self-update 1.10.26
+- nvm install 10
+- nvm use 10
 - travis_retry yarn
 jobs:
   include:
@@ -24,8 +27,16 @@ jobs:
     php: 7.3
     script:
     - "./bin/lint.sh"
+  - stage: lint
+    php: 7.4
+    script:
+    - "./bin/lint.sh"
+  - stage: lint
+    php: 8.0
+    script:
+    - "./bin/lint.sh"
   - stage: deploy
-    php: 7.2
+    php: 7.4
     script:
     - "./bin/build.sh"
     if: branch = master
diff --git a/author.php b/author.php
index 0a94aed..10c92a6 100644
--- a/author.php
+++ b/author.php
@@ -20,7 +20,7 @@
 			<div class="authorMeta">
 				<h1><?php echo esc_html( $author_name ); ?></h1>
 				<?php if ( isset( $author_image ) && ! empty( $author_image ) ) : ?>
-					<img class="authorMeta-image" src="<?php echo esc_html( $author_image ); ?>" alt="Photo of <?php echo esc_html( $author_name ); ?>">
+					<img class="authorMeta-image" src="<?php echo esc_url( $author_image ); ?>" alt="Photo of <?php echo esc_attr( $author_name ); ?>">
 				<?php endif; ?>
 			</div>
 
diff --git a/bin/lint.sh b/bin/lint.sh
index 2725b2f..7c49563 100755
--- a/bin/lint.sh
+++ b/bin/lint.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env sh
+
 composer global require \
-  dealerdirect/phpcodesniffer-composer-installer:0.5.0 \
-  wp-coding-standards/wpcs:1.2.1 \
-  automattic/vipwpcs:0.4.0 \
+  dealerdirect/phpcodesniffer-composer-installer:0.7.2 \
+  wp-coding-standards/wpcs:2.3.0 \
+  automattic/vipwpcs:2.3.0 \
   && yarn lint
diff --git a/block-languages/benenson-blocks.pot b/block-languages/benenson-blocks.pot
index f540a1c..c0f76b1 100644
--- a/block-languages/benenson-blocks.pot
+++ b/block-languages/benenson-blocks.pot
@@ -37,7 +37,7 @@ msgid "Centre align the action block."
 msgstr ""
 
 #: src/scripts/blocks/action/DisplayComponent.js:80
-#: src/scripts/blocks/image/DisplayComponent.js:239
+#: src/scripts/blocks/image/DisplayComponent.js:237
 #: src/scripts/blocks/post-list/components/editable/GridItem.js:57
 #: src/scripts/blocks/post-list/components/editable/PostItem.js:96
 #: src/scripts/blocks/post-list/components/editable/SplitGridItem.js:65
@@ -174,14 +174,14 @@ msgstr ""
 # text alignment. for RTL languages, localise as 'Right'
 #: src/scripts/blocks/blockquote/index.js:227
 #: src/scripts/blocks/header/DisplayComponent.js:77
-#: src/scripts/blocks/image/DisplayComponent.js:201
+#: src/scripts/blocks/image/DisplayComponent.js:199
 #: src/scripts/blocks/link/DisplayComponent.js:41
 #: src/scripts/blocks/slider/DisplayComponent.js:37
 msgid "Left"
 msgstr ""
 
 #: src/scripts/blocks/blockquote/index.js:228
-#: src/scripts/blocks/image/DisplayComponent.js:197
+#: src/scripts/blocks/image/DisplayComponent.js:195
 #: src/scripts/blocks/section/index.js:53
 #: src/scripts/blocks/tweet/index.js:26
 msgid "Default"
@@ -190,7 +190,7 @@ msgstr ""
 # text alignment. for RTL languages, localise as 'Left'
 #: src/scripts/blocks/blockquote/index.js:233
 #: src/scripts/blocks/header/DisplayComponent.js:84
-#: src/scripts/blocks/image/DisplayComponent.js:208
+#: src/scripts/blocks/image/DisplayComponent.js:206
 #: src/scripts/blocks/link/DisplayComponent.js:47
 #: src/scripts/blocks/slider/DisplayComponent.js:44
 msgid "Right"
@@ -199,20 +199,20 @@ msgstr ""
 #: src/scripts/blocks/blockquote/index.js:289
 #: src/scripts/blocks/header/DisplayComponent.js:115
 #: src/scripts/blocks/links-with-icons/InnerDisplayComponent.js:223
-#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:95
+#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:94
 #: src/scripts/blocks/section/DisplayComponent.js:61
 msgid "Small"
 msgstr ""
 
 #: src/scripts/blocks/blockquote/index.js:292
 #: src/scripts/blocks/links-with-icons/InnerDisplayComponent.js:226
-#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:98
+#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:97
 msgid "Medium"
 msgstr ""
 
 #: src/scripts/blocks/blockquote/index.js:295
 #: src/scripts/blocks/links-with-icons/InnerDisplayComponent.js:229
-#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:101
+#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:100
 msgid "Large"
 msgstr ""
 
@@ -232,7 +232,7 @@ msgstr ""
 
 #: src/scripts/blocks/blockquote/index.js:323
 #: src/scripts/blocks/header/DisplayComponent.js:123
-#: src/scripts/blocks/image/DisplayComponent.js:220
+#: src/scripts/blocks/image/DisplayComponent.js:218
 msgid "Alignment"
 msgstr ""
 
@@ -328,7 +328,7 @@ msgid "(Heading)"
 msgstr ""
 
 #: src/scripts/blocks/call-to-action/DisplayComponent.js:83
-#: src/scripts/blocks/image/DisplayComponent.js:286
+#: src/scripts/blocks/image/DisplayComponent.js:284
 #: src/scripts/blocks/slider/DisplayComponent.js:322
 msgid "(Content)"
 msgstr ""
@@ -460,12 +460,12 @@ msgid "Edit File"
 msgstr ""
 
 #: src/scripts/blocks/header/DisplayComponent.js:104
-#: src/scripts/blocks/image/DisplayComponent.js:389
+#: src/scripts/blocks/image/DisplayComponent.js:387
 msgid "Image"
 msgstr ""
 
 #: src/scripts/blocks/header/DisplayComponent.js:107
-#: src/scripts/blocks/image/DisplayComponent.js:392
+#: src/scripts/blocks/image/DisplayComponent.js:390
 msgid "Video"
 msgstr ""
 
@@ -475,7 +475,7 @@ msgid "Normal"
 msgstr ""
 
 #: src/scripts/blocks/header/DisplayComponent.js:141
-#: src/scripts/blocks/image/DisplayComponent.js:387
+#: src/scripts/blocks/image/DisplayComponent.js:385
 msgid "Background Type"
 msgstr ""
 
@@ -516,7 +516,7 @@ msgid "(Call to action)"
 msgstr ""
 
 #: src/scripts/blocks/header/DisplayComponent.js:80
-#: src/scripts/blocks/image/DisplayComponent.js:205
+#: src/scripts/blocks/image/DisplayComponent.js:203
 #: src/scripts/blocks/slider/DisplayComponent.js:40
 msgid "Centre"
 msgstr ""
@@ -594,61 +594,61 @@ msgstr ""
 msgid "Responsive Iframe"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:144
+#: src/scripts/blocks/image/DisplayComponent.js:142
 #: src/scripts/blocks/link/DisplayComponent.js:90
 msgid "(Link Text)"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:152
+#: src/scripts/blocks/image/DisplayComponent.js:150
 msgid "Remove Button"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:189
+#: src/scripts/blocks/image/DisplayComponent.js:187
 msgid "Fixed Height (600px)"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:192
+#: src/scripts/blocks/image/DisplayComponent.js:190
 msgid "Actual Height"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:214
+#: src/scripts/blocks/image/DisplayComponent.js:212
 msgid "Image Style"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:221
+#: src/scripts/blocks/image/DisplayComponent.js:219
 msgid "Only has an effect on images smaller than their container"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:280
+#: src/scripts/blocks/image/DisplayComponent.js:278
 msgid "(Title)"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:297
+#: src/scripts/blocks/image/DisplayComponent.js:295
 msgid "Add Button"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:321
+#: src/scripts/blocks/image/DisplayComponent.js:319
 msgid "Choose Video"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:336
+#: src/scripts/blocks/image/DisplayComponent.js:334
 #: src/scripts/packages/editor/PostFeaturedVideo.js:79
 msgid "Replace Video"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:340
+#: src/scripts/blocks/image/DisplayComponent.js:338
 msgid "Remove Video"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:404
+#: src/scripts/blocks/image/DisplayComponent.js:402
 msgid "Display Overlay"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:409
+#: src/scripts/blocks/image/DisplayComponent.js:407
 msgid "Enable Parallax"
 msgstr ""
 
-#: src/scripts/blocks/image/DisplayComponent.js:429
+#: src/scripts/blocks/image/DisplayComponent.js:427
 msgid "(Insert Caption, if required)"
 msgstr ""
 
@@ -752,8 +752,8 @@ msgstr ""
 msgid "Add a links-with-icons block"
 msgstr ""
 
-#: src/scripts/blocks/links-with-icons/InnerDisplayComponent.js:104
-#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:56
+#: src/scripts/blocks/links-with-icons/InnerDisplayComponent.js:105
+#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:55
 msgid "Pick an image"
 msgstr ""
 
@@ -779,12 +779,12 @@ msgid "Style"
 msgstr ""
 
 #: src/scripts/blocks/links-with-icons/InnerDisplayComponent.js:243
-#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:113
+#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:112
 msgid "Icon Size"
 msgstr ""
 
 #: src/scripts/blocks/links-with-icons/InnerDisplayComponent.js:249
-#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:119
+#: src/scripts/blocks/logo-list/InnerDisplayComponent.js:118
 msgid "Hide Image Credit Display"
 msgstr ""
 
diff --git a/footer.php b/footer.php
index ab582fc..1e138dc 100644
--- a/footer.php
+++ b/footer.php
@@ -23,7 +23,7 @@
 			<?php if ( $footer_section['title'] || $footer_section['content'] ) : ?>
 				<li class="page-footerSection page-footerSection--large">
 				<?php if ( $footer_section['title'] ) : ?>
-					<a><?php echo esc_attr( $footer_section['title'] ); ?></a>
+					<a><?php echo esc_html( $footer_section['title'] ); ?></a>
 				<?php endif; ?>
 
 				<?php if ( $footer_section['content'] ) : ?>
diff --git a/header.php b/header.php
index b49feca..42e3237 100644
--- a/header.php
+++ b/header.php
@@ -71,7 +71,7 @@
 
 <?php do_action( 'benenson_after_body_open_tag' ); ?>
 
-<?php require_once get_template_directory() . '/assets/images/symbol-defs.svg'; ?>
+<?php require_once get_template_directory() . '/assets/images/symbol-defs.svg'; // phpcs:ignore WordPressVIPMinimum.Files.IncludingNonPHPFile.IncludingSVGCSSFile ?>
 
 <a class="skipLink" href="#main"><?php echo esc_html( /* translators: Label for screen reader/keyboard users */ __( 'Skip to main content', 'benenson' ) ); ?></a>
 
@@ -84,14 +84,14 @@
 				<?php benenson_nav( 'main-menu' ); ?>
 			</ul>
 			<?php if ( ! benenson_get_option( '_search_disabled', false ) && ! benenson_get_option( '_search_navigation_disabled', false ) ) : ?>
-			<div class="page-headerSearchContainer" role="search" aria-label="<?php echo esc_attr( 'Search', 'benenson' ); ?>">
+			<div class="page-headerSearchContainer" role="search" aria-label="<?php echo esc_attr__( 'Search', 'benenson' ); ?>">
 				<button data-toggle-search class="page-headerSearch" role="button" aria-label="<?php echo esc_attr( __( 'Show search form', 'benenson' ) ); ?>">
-					<span class="u-hiddenVisually"><?php esc_attr_e( 'Search', 'benenson' ); ?></span>
+					<span class="u-hiddenVisually"><?php esc_html_e( 'Search', 'benenson' ); ?></span>
 				</button>
 				<?php get_search_form(); ?>
 			</div>
 			<?php endif; ?>
-			<button class="page-headerHamburger" data-toggle-menu role="button" aria-expanded="false" aria-label="<?php echo esc_attr( 'Open navigation', 'benenson' ); ?>"><span></span></button>
+			<button class="page-headerHamburger" data-toggle-menu role="button" aria-expanded="false" aria-label="<?php echo esc_attr__( 'Open navigation', 'benenson' ); ?>"><span></span></button>
 		</nav>
 	</div>
 </header>
@@ -99,7 +99,7 @@
 <div class="page-mobileMenuOverlay" data-toggle-menu aria-hidden="true">
 	<section class="page-mobileMenu">
 		<header class="page-mobileMenuHeader">
-			<h2><?php esc_attr_e( 'Main Menu', 'benenson' ); ?></h2>
+			<h2><?php esc_html_e( 'Main Menu', 'benenson' ); ?></h2>
 			<button data-toggle-menu tabindex="-1" role="button" aria-expanded="true" aria-label="<?php echo esc_attr( __( 'Close navigation', 'benenson' ) ); ?>"></button>
 		</header>
 		<nav class="page-mobileMenuNav">
diff --git a/includes/analytics-output.php b/includes/analytics-output.php
index f7257c6..80304ba 100644
--- a/includes/analytics-output.php
+++ b/includes/analytics-output.php
@@ -110,7 +110,7 @@ function benenson_analytics_fallback() {
 			?>
 			<!-- Google Tag Manager (noscript) -->
 			<noscript>
-				<iframe src="https://www.googletagmanager.com/ns.html?id=<?php echo esc_html( $google_tag_manager ); ?>" height="0" width="0" style="display:none;visibility:hidden"></iframe>
+				<iframe src="https://www.googletagmanager.com/ns.html?id=<?php echo esc_attr( $google_tag_manager ); ?>" height="0" width="0" style="display:none;visibility:hidden"></iframe>
 			</noscript>
 			<!-- End Google Tag Manager (noscript) -->
 			<?php
diff --git a/includes/blocks/header/render.php b/includes/blocks/header/render.php
index dd4b8be..99b13d0 100644
--- a/includes/blocks/header/render.php
+++ b/includes/blocks/header/render.php
@@ -66,12 +66,14 @@ function benenson_render_header_block( array $attributes = [] ) {
 			);
 		}
 
+		// phpcs:disable WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 		printf(
 			'<section id="banner-%s" class="page-hero %s" role="figure" aria-label="%s">',
 			esc_attr( $banner_identifier ),
 			esc_attr( implode( ' ', $classlist ) ),
 			esc_attr( $attributes['title'] )
 		);
+		// phpcs:enable WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 
 		if ( 'video' === $attributes['type'] ) {
 			printf(
diff --git a/includes/blocks/list-block/render.php b/includes/blocks/list-block/render.php
index b6adc91..624e298 100644
--- a/includes/blocks/list-block/render.php
+++ b/includes/blocks/list-block/render.php
@@ -464,6 +464,7 @@ function benenson_render_list_block( $attributes ) {
 		ob_start();
 
 		if ( isset( $attributes['style'] ) && 'grid' === $attributes['style'] ) {
+			// phpcs:ignore WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 			printf( '<div class="grid grid-%s">', esc_attr( count( $data ) ) );
 			array_map( 'benenson_render_grid_item', $data );
 			print '</div>';
@@ -472,6 +473,7 @@ function benenson_render_list_block( $attributes ) {
 		}
 
 		if ( isset( $attributes['style'] ) && 'post' === $attributes['style'] ) {
+			// phpcs:ignore WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 			printf( '<div class="grid grid-%s">', esc_attr( count( $data ) ) );
 			array_map( 'benenson_render_post_item', $data );
 			print '</div>';
@@ -480,6 +482,7 @@ function benenson_render_list_block( $attributes ) {
 		}
 
 		if ( isset( $attributes['style'] ) && 'splitgrid' === $attributes['style'] ) {
+			// phpcs:ignore WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 			printf( '<div class="splitGrid splitGrid-%s">', esc_attr( count( $data ) ) );
 			$index = 0;
 			$total = count( $data );
diff --git a/includes/disable-rest-api.php b/includes/disable-rest-api.php
index 84163da..f2bc882 100644
--- a/includes/disable-rest-api.php
+++ b/includes/disable-rest-api.php
@@ -1,5 +1,7 @@
 <?php
 
+// phpcs:disable WordPressVIPMinimum.Hooks.AlwaysReturnInFilter.MissingReturnStatement
+
 /**
  * Disables the rest API for users that are not logged in.
  *
@@ -45,3 +47,5 @@ function benenson_disable_rest_api( $result ) {
 }
 
 add_filter( 'rest_authentication_errors', 'benenson_disable_rest_api' );
+
+// phpcs:enable WordPressVIPMinimum.Hooks.AlwaysReturnInFilter.MissingReturnStatement
diff --git a/includes/mobile-nav-walker.php b/includes/mobile-nav-walker.php
index 9f79e2b..15b4f69 100644
--- a/includes/mobile-nav-walker.php
+++ b/includes/mobile-nav-walker.php
@@ -143,11 +143,13 @@ public function start_el( &$output, $item, $depth = 0, $args = [], $id = 0 ) {
 		$item_output .= $args->link_before . $title . $args->link_after;
 		$item_output .= '</a>';
 		if ( $has_children ) {
+			// phpcs:disable WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 			$item_output .= sprintf(
 				'<button class="page-mobileMenuToggle" role="button" aria-expanded="false" aria-label="%1$s" tabindex="-1"><span class="u-hiddenVisually">%1$s</span></button>',
 				/* translators: Accessibility label for mobile navigation dropdown button */
 				esc_attr( sprintf( __( 'Expand %s sub-list', 'benenson' ), $title ) )
 			);
+			// phpcs:enable WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 		}
 		$item_output .= $args->after;
 
diff --git a/includes/taxonomies.php b/includes/taxonomies.php
index ffadaa8..59b2716 100644
--- a/includes/taxonomies.php
+++ b/includes/taxonomies.php
@@ -131,12 +131,14 @@ function is_current_category( WP_Term $cat ) {
  */
 if ( ! function_exists( 'print_category_option' ) ) {
 	function print_category_option( WP_Term $cat ) {
+		// phpcs:disable WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 		printf(
 			'<option value="%s" %s>%s</option>',
 			esc_attr( get_term_link( $cat ) ),
 			esc_attr( is_current_category( $cat ) ? 'selected' : '' ),
 			esc_html( $cat->name )
 		);
+		// phpcs:enable WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 	}
 }
 
diff --git a/includes/theme-options.php b/includes/theme-options.php
index 49e4ca5..9a5bd8a 100644
--- a/includes/theme-options.php
+++ b/includes/theme-options.php
@@ -591,7 +591,7 @@ function benenson_theme_option_admin_page() {
 				<th scope="row"><?php esc_html_e( 'Google Analytics', 'benenson' ); ?></th>
 				<td>
 					<?php $value = benenson_get_option( '_analytics_ga', '' ); ?>
-					<input type="text" name="_analytics_ga" value="<?php echo esc_html( $value ); ?>" placeholder="UA-XXXXX-X">
+					<input type="text" name="_analytics_ga" value="<?php echo esc_attr( $value ); ?>" placeholder="UA-XXXXX-X">
 				</td>
 			</tr>
 			<?php
@@ -612,7 +612,7 @@ function benenson_theme_option_admin_page() {
 						<option value="" disabled>Select a Sidebar</option>
 						<option value=""></option>
 						<?php foreach ( $sidebar_post_list as $post_id => $post ) : ?>
-						<option value="<?php echo esc_html( strval( $post_id ) ); ?>" <?php selected( $value, strval( $post_id ), true ); ?>><?php echo esc_html( $post ); ?></option>
+						<option value="<?php echo esc_attr( strval( $post_id ) ); ?>" <?php selected( $value, strval( $post_id ), true ); ?>><?php echo esc_html( $post ); ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
@@ -625,7 +625,7 @@ function benenson_theme_option_admin_page() {
 						<option value="" disabled>Select a Sidebar</option>
 						<option value=""></option>
 						<?php foreach ( $sidebar_post_list as $post_id => $post ) : ?>
-						<option value="<?php echo esc_html( strval( $post_id ) ); ?>" <?php selected( $value, strval( $post_id ), true ); ?>><?php echo esc_html( $post ); ?></option>
+						<option value="<?php echo esc_attr( strval( $post_id ) ); ?>" <?php selected( $value, strval( $post_id ), true ); ?>><?php echo esc_html( $post ); ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
@@ -638,7 +638,7 @@ function benenson_theme_option_admin_page() {
 						<option value="" disabled>Select a Sidebar</option>
 						<option value=""></option>
 						<?php foreach ( $sidebar_post_list as $post_id => $post ) : ?>
-						<option value="<?php echo esc_html( $post_id ); ?>" <?php selected( $value, esc_html( $post_id ), true ); ?>><?php echo esc_html( $post ); ?></option>
+						<option value="<?php echo esc_attr( $post_id ); ?>" <?php selected( $value, esc_html( $post_id ), true ); ?>><?php echo esc_html( $post ); ?></option>
 						<?php endforeach; ?>
 					</select>
 				</td>
@@ -693,7 +693,7 @@ function benenson_theme_option_admin_page() {
 						<img id="_logo_image" src="<?php echo esc_url( $attachment ); ?>" />
 					</div>
 					<div>
-						<input id="_logo_input" type="hidden" name="_logo" value="<?php echo esc_html( $value ); ?>" />
+						<input id="_logo_input" type="hidden" name="_logo" value="<?php echo esc_attr( $value ); ?>" />
 						<input id="upload_image_button" type="button" class="button-primary" value="Insert Image" />
 					</div>
 				</td>
diff --git a/package.json b/package.json
index 1334eac..5cab7c3 100755
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
   "devDependencies": {
     "@wordpress/babel-plugin-makepot": "^2.0.1",
     "@wordpress/i18n": "^1.2.1",
+    "autoprefixer": "^7.1.4",
     "babel-core": "^6.26.0",
     "babel-eslint": "^8.0.1",
     "babel-jest": "^21.2.0",
@@ -20,27 +21,18 @@
     "babel-preset-react": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "babel-runtime": "^6.26.0",
+    "browser-sync": "^2.18.13",
+    "cssnano": "^3.10.0",
+    "del": "^3.0.0",
+    "dotenv": "^4.0.0",
     "eslint": "^4.8.0",
     "eslint-config-airbnb-base": "^12.0.1",
     "eslint-loader": "^1.9.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jest": "^21.2.0",
+    "eslint-plugin-react": "^7.10.0",
     "exports-loader": "^0.6.4",
     "expose-loader": "^0.7.3",
-    "node-neat": "^2.0.0-beta.0",
-    "sassdoc-theme-neat": "0.0.2"
-  },
-  "dependencies": {
-    "autoprefixer": "^7.1.4",
-    "browser-sync": "^2.18.13",
-    "classnames": "^2.2.6",
-    "core-js": "^2.5.1",
-    "cssnano": "^3.10.0",
-    "del": "^3.0.0",
-    "dotenv": "^4.0.0",
-    "eslint-plugin-react": "^7.10.0",
-    "flickity": "^2.1.2",
-    "flickity-as-nav-for": "^2.0.1",
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^4.0.0",
     "gulp-awspublish": "^3.3.0",
@@ -59,8 +51,7 @@
     "gulp-webserver": "^0.9.1",
     "imagemin-pngquant": "^5.0.1",
     "jest": "^21.2.1",
-    "lodash-es": "^4.17.10",
-    "memize": "^1.0.5",
+    "node-neat": "^2.0.0-beta.0",
     "node-normalize-scss": "^3.0.0",
     "node-notifier": "^5.0.2",
     "postcss-banner": "^3.0.0",
@@ -70,17 +61,29 @@
     "postcss-reporter": "^5.0.0",
     "postcss-scss": "^1.0.2",
     "react": "^16.4.1",
-    "react-dom": "^16.4.1",
-    "react-select": "^2.0.0",
     "sass-module-importer": "^1.4.0",
     "sass-mq": "^3.3.2",
     "sassdoc": "^2.3.0",
     "sassdoc-theme-flippant": "^0.1.0",
+    "sassdoc-theme-neat": "0.0.2",
     "strip-ansi": "^4.0.0",
     "stylelint": "^8.1.1",
     "stylelint-scss": "^2.1.0",
     "webpack": "^3.6.0"
   },
+  "dependencies": {
+    "classnames": "^2.2.6",
+    "core-js": "^2.5.1",
+    "flickity": "^2.1.2",
+    "flickity-as-nav-for": "^2.0.1",
+    "lodash-es": "^4.17.10",
+    "memize": "^1.0.5",
+    "react-dom": "^16.4.1",
+    "react-select": "^2.0.0"
+  },
+  "resolutions": {
+    "graceful-fs": "^4.2.9"
+  },
   "scripts": {
     "lint": "yarn lint-scripts && yarn lint-styles && yarn lint-php && yarn lint-shell",
     "lint-php": "$(composer config -g home)/vendor/bin/phpcs .",
diff --git a/partials/archive-categories.php b/partials/archive-categories.php
index 4740375..ab1e523 100644
--- a/partials/archive-categories.php
+++ b/partials/archive-categories.php
@@ -42,7 +42,7 @@
 		?>
 		<li <?php $active && printf( 'class="is-current" data-categories-selected="%d"', esc_attr( $key ) ); ?>>
 			<div>
-				<a class="btn btn--white" href="<?php echo esc_url( $termlink ); ?>"><?php echo esc_attr( $featured_category->name ); ?></a>
+				<a class="btn btn--white" href="<?php echo esc_url( $termlink ); ?>"><?php echo esc_html( $featured_category->name ); ?></a>
 			</div>
 		</li>
 	<?php endforeach; ?>
@@ -58,11 +58,12 @@
 }
 ?>
 
-<aside class="news-sidebar section section--small" role="complementary" aria-label="<?php esc_html_e( 'List of subcategories', 'benenson' ); ?>">
+<aside class="news-sidebar section section--small" role="complementary" aria-label="<?php esc_attr_e( 'List of subcategories', 'benenson' ); ?>">
 	<span class="element-select <?php has_term_parent( get_queried_object() ) && print 'is-active'; ?>">
 		<select aria-label="<?php echo esc_attr( __( 'List of second-level categories', 'benenson' ) ); ?>">
 		<?php
 
+		// phpcs:ignore WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 		printf( '<option value="%s">%s</option>', esc_attr( get_term_link( get_term_parent( get_queried_object() ) ) ), esc_html( __( 'Select a sub filter', 'benenson' ) ) );
 		array_map( 'print_category_option', $sub_categories );
 
@@ -94,6 +95,7 @@
 		<select aria-label="<?php echo esc_attr( __( 'List of third-level categories', 'benenson' ) ); ?>">
 		<?php
 
+		// phpcs:ignore WordPressVIPMinimum.Security.ProperEscapingFunction.notAttrEscAttr
 		printf( '<option value="%s">%s</option>', esc_attr( get_term_link( get_term_parent( get_queried_object() ) ) ), esc_html( __( 'Select a sub filter', 'benenson' ) ) );
 		array_map( 'print_category_option', $sub_sub_cats );
 
diff --git a/partials/archive-header.php b/partials/archive-header.php
index 4ae91bf..a48b800 100644
--- a/partials/archive-header.php
+++ b/partials/archive-header.php
@@ -25,7 +25,7 @@
 		<div class="element-select">
 			<select id="sort-by" name="sort" aria-labelledby="sort-description">
 			<?php foreach ( $available_sorts as $value => $label ) : ?>
-				<option value="<?php echo esc_attr( $value ); ?>" <?php echo wp_kses_post( $value === $current_sort ? 'selected' : '' ); ?>><?php echo esc_attr( $label ); ?></option>
+				<option value="<?php echo esc_attr( $value ); ?>" <?php echo wp_kses_post( $value === $current_sort ? 'selected' : '' ); ?>><?php echo esc_html( $label ); ?></option>
 			<?php endforeach; ?>
 			</select>
 		</div>
diff --git a/partials/article-share.php b/partials/article-share.php
index 5e90e17..7a6eb1a 100644
--- a/partials/article-share.php
+++ b/partials/article-share.php
@@ -1,6 +1,6 @@
 <?php spaceless(); ?>
 <div class="article-share" role="complementary" aria-label="<?php echo esc_attr( __( 'Social sharing options', 'benenson' ) ); ?>">
-	<h3 class="article-shareTitle"><?php esc_attr_e( 'Share', 'benenson' ); ?></h3>
+	<h3 class="article-shareTitle"><?php esc_html_e( 'Share', 'benenson' ); ?></h3>
 	<ul>
 		<li>
 			<a class="article-shareFacebook" target="_blank" rel="noopener" href="https://www.facebook.com/sharer.php?u=<?php the_permalink(); ?>" title="<?php esc_attr_e( 'Share on Facebook', 'benenson' ); ?>">
diff --git a/partials/pagination.php b/partials/pagination.php
index c272735..f131484 100644
--- a/partials/pagination.php
+++ b/partials/pagination.php
@@ -24,7 +24,7 @@
 		<?php else : ?>
 			<button disabled>
 				<span class="icon"></span>
-				<span><?php esc_attr_e( 'Previous', 'benenson' ); ?></span>
+				<span><?php esc_html_e( 'Previous', 'benenson' ); ?></span>
 			</button>
 		<?php endif; ?>
 		</div>
@@ -39,7 +39,7 @@
 		<?php else : ?>
 			<button disabled>
 				<span class="icon"></span>
-				<span><?php esc_attr_e( 'Next', 'benenson' ); ?></span>
+				<span><?php esc_html_e( 'Next', 'benenson' ); ?></span>
 			</button>
 		<?php endif; ?>
 		</div>
diff --git a/partials/post/post-content.php b/partials/post/post-content.php
index 5d2c3e2..08dd209 100644
--- a/partials/post/post-content.php
+++ b/partials/post/post-content.php
@@ -14,9 +14,9 @@
 	<div class="post-meta">
 		<?php if ( $post_tag ) : ?>
 			<?php $term_link = get_term_link( $post_tag, $post_tag->taxonomy ); ?>
-			<a class="post-category" aria-label="<?php /* translators: placeholder is category name */ sprintf( __( 'Article category %s', 'benenson' ), esc_attr( $post_tag->name ) ); ?>" href="<?php echo esc_url( is_wp_error( $term_link ) ? home_url() : $term_link ); ?>"><?php echo esc_attr( $post_tag->name ); ?></a>
+			<a class="post-category" aria-label="<?php /* translators: placeholder is category name */ sprintf( __( 'Article category %s', 'benenson' ), esc_attr( $post_tag->name ) ); ?>" href="<?php echo esc_url( is_wp_error( $term_link ) ? home_url() : $term_link ); ?>"><?php echo esc_html( $post_tag->name ); ?></a>
 		<?php endif; ?>
-		<span class="post-date" aria-label="<?php echo esc_attr( __( 'Post published date', 'benenson' ) ); ?>"><?php echo esc_attr( $date ); ?></span>
+		<span class="post-date" aria-label="<?php echo esc_attr( __( 'Post published date', 'benenson' ) ); ?>"><?php echo esc_html( $date ); ?></span>
 	</div>
 	<header class="post-header">
 		<h1 class="post-title"><span><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></span></h1>
diff --git a/partials/post/post-search.php b/partials/post/post-search.php
index 43c3d14..8be0d91 100644
--- a/partials/post/post-search.php
+++ b/partials/post/post-search.php
@@ -15,9 +15,9 @@
 	<a class="floating-anchor" href="<?php the_permalink(); ?>" aria-hidden="true"></a>
 <?php if ( $post_term ) : ?>
 	<?php $post_term_link = get_term_link( $post_term, $post_term->taxonomy ); ?>
-	<a class="post-category" href="<?php echo esc_url( is_wp_error( $post_term_link ) ? home_url() : $post_term_link ); ?>" tabindex="0"><?php echo esc_attr( $post_term->name ); ?></a>
+	<a class="post-category" href="<?php echo esc_url( is_wp_error( $post_term_link ) ? home_url() : $post_term_link ); ?>" tabindex="0"><?php echo esc_html( $post_term->name ); ?></a>
 <?php endif; ?>
 	<h1 class="post-title"><a href="<?php the_permalink(); ?>" tabindex="0"><?php the_title(); ?></a></h1>
-	<div class="post-excerpt"><?php echo esc_attr( trim_text( get_the_excerpt(), 300, true, true ) ); ?></div>
-	<span class="post-byline" aria-label="<?php echo esc_attr( __( 'Post published date', 'benenson' ) ); ?>"><?php echo esc_attr( $date ); ?></span>
+	<div class="post-excerpt"><?php echo esc_html( trim_text( get_the_excerpt(), 300, true, true ) ); ?></div>
+	<span class="post-byline" aria-label="<?php echo esc_attr( __( 'Post published date', 'benenson' ) ); ?>"><?php echo esc_html( $date ); ?></span>
 </article>
diff --git a/phpcs.xml b/phpcs.xml
index e34fb82..bb07b2f 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -8,7 +8,8 @@
     <arg name="report-width" value="192" />
     <arg name="report" value="full" />
     <arg name="extensions" value="php" />
-    <arg value="q" />
+    <arg name="cache" />
+    <arg value="qs" />
 
     <ini name="memory_limit" value="1024M" />
 
@@ -20,17 +21,20 @@
 
     <!-- Remove our generated block tranlation files as they generate erros. -->
     <exclude-pattern>*/block-translations.php</exclude-pattern>
-    
+
     <rule ref="PEAR.Functions.FunctionCallSignature.SpaceAfterOpenBracket" />
     <rule ref="PEAR.Functions.FunctionCallSignature.SpaceBeforeCloseBracket" />
 
     <rule ref="WordPress-Core">
+        <exclude name="Generic.Arrays.DisallowShortArraySyntax.Found" />
+        <exclude name="WordPress.DateTime.RestrictedFunctions.date_date" />
         <exclude name="WordPress.Files.FileName" />
+        <exclude name="WordPress.PHP.DisallowShortTernary.Found" />
     </rule>
 
     <rule ref="WordPress-Extra" />
 
-    <rule ref="WordPress-VIP">
+    <rule ref="WordPress-VIP-Go">
         <exclude name="WordPressVIPMinimum.VIP.RestrictedFunctions.wp_mail_wp_mail" />
         <exclude name="WordPressVIPMinimum.VIP.RestrictedFunctions.user_meta_get_user_meta" />
         <exclude name="WordPressVIPMinimum.VIP.RestrictedFunctions.switch_to_blog_switch_to_blog" />
diff --git a/searchform.php b/searchform.php
index 5245567..6f115c8 100644
--- a/searchform.php
+++ b/searchform.php
@@ -1,5 +1,5 @@
 <form class="page-search" action="<?php echo esc_url( home_url( '/' ) ); ?>" data-page-search>
 	<label for="search" class="u-hiddenVisually"><?php echo esc_html( /* translators: screen reader text for search field */ __( 'Search input', 'benenson' ) ); ?></label>
 	<input id="search" type="text" name="s" required role="searchbox" placeholder="<?php esc_attr_e( 'What are you looking for?', 'benenson' ); ?>" value="<?php echo esc_attr( get_query_var( 's' ) ); ?>">
-	<button class="btn btn--dark" type="submit"><?php esc_attr_e( 'Search', 'benenson' ); ?></button>
+	<button class="btn btn--dark" type="submit"><?php esc_html_e( 'Search', 'benenson' ); ?></button>
 </form>
diff --git a/single.php b/single.php
index eb18c0c..2eb6fd1 100644
--- a/single.php
+++ b/single.php
@@ -39,13 +39,13 @@
 				<?php $term_link = get_term_link( $main_category, 'category' ); ?>
 				<a class="btn btn--white has-icon" aria-label="<?php echo esc_attr( sprintf( /* translators: Link to return to all posts of category %s */ __( 'Back to %s', 'benenson' ), $main_category->name ) ); ?>" href="<?php echo esc_url( is_wp_error( $term_link ) ? home_url() : $term_link ); ?>">
 					<span class="icon-arrow-left"></span>
-					<span><?php echo esc_attr( $main_category->name ); ?></span>
+					<span><?php echo esc_html( $main_category->name ); ?></span>
 				</a>
 			<?php endif; ?>
 				<div class="article-meta-data">
-					<div class="article-meta-item" aria-label="<?php echo esc_attr( __( 'Post published timestamp', 'benenson' ) ); ?>"><?php echo esc_attr( $the_time ); ?></div>
+					<div class="article-meta-item" aria-label="<?php echo esc_attr( __( 'Post published timestamp', 'benenson' ) ); ?>"><?php echo esc_html( $the_time ); ?></div>
 				<?php if ( true === apply_filters( 'benenson_display_author', false ) ) : ?>
-					<div class="bypostauthor"><?php echo esc_attr( sprintf( '%s %s', __( 'Authored by', 'benenson' ), get_the_author() ) ); ?></div>
+					<div class="bypostauthor"><?php echo esc_html( sprintf( '%s %s', __( 'Authored by', 'benenson' ), get_the_author() ) ); ?></div>
 				<?php endif; ?>
 				</div>
 			</nav>
@@ -63,7 +63,7 @@
 			?>
 
 			<?php if ( $caption ) : ?>
-				<span class="article-figureCopyright"><?php echo esc_attr( $caption ); ?></span>
+				<span class="article-figureCopyright"><?php echo esc_html( $caption ); ?></span>
 			<?php endif; ?>
 			</figure>
 		<?php endif; ?>
@@ -104,9 +104,10 @@
 				/* translators: 1: posted in label, only visible to screen readers. 2: list of tags. */
 				printf(
 					'<span class="screen-reader-text">%1$s </span>%2$s',
-					__( 'Tags:', 'benenson' ),
+					esc_html__( 'Tags:', 'benenson' ),
+					// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 					$tags_list
-				); // WPCS: XSS OK.
+				);
 			}
 
 			?>
diff --git a/src/scripts/blocks/image/DisplayComponent.js b/src/scripts/blocks/image/DisplayComponent.js
index 6d12020..9460c95 100644
--- a/src/scripts/blocks/image/DisplayComponent.js
+++ b/src/scripts/blocks/image/DisplayComponent.js
@@ -1,5 +1,3 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
 import classnames from 'classnames';
 
 const { __ } = wp.i18n;
diff --git a/src/scripts/blocks/links-with-icons/InnerDisplayComponent.js b/src/scripts/blocks/links-with-icons/InnerDisplayComponent.js
index 52ee42c..d1c268d 100644
--- a/src/scripts/blocks/links-with-icons/InnerDisplayComponent.js
+++ b/src/scripts/blocks/links-with-icons/InnerDisplayComponent.js
@@ -1,8 +1,6 @@
 /**
  * Third-party
  */
-import React from 'react';
-import ReactDOM from 'react-dom';
 import classnames from 'classnames';
 import pick from 'lodash-es/pick';
 
@@ -10,18 +8,21 @@ import pick from 'lodash-es/pick';
  * WordPress
  */
 const { __ } = wp.i18n;
-const { Component, Fragment } = wp.element;
+const {
+  Component,
+  createRef,
+  findDOMNode,
+  Fragment,
+} = wp.element;
 const { applyFilters } = wp.hooks;
 const {
   Button,
   CheckboxControl,
   PanelBody,
-  RangeControl,
   SelectControl,
 } = wp.components;
 const {
   InspectorControls,
-  InnerBlocks,
   MediaUpload,
   RichText,
   URLInputButton,
@@ -54,7 +55,7 @@ export default class DisplayComponent extends Component {
   constructor(...params) {
     super(...params);
 
-    this.bigTextRef = React.createRef();
+    this.bigTextRef = createRef();
   }
 
   componentDidUpdate(props) {
@@ -110,8 +111,7 @@ export default class DisplayComponent extends Component {
       return {};
     }
 
-    const { setAttributes } = this.props;
-    const node = ReactDOM.findDOMNode(this.bigTextRef.current);
+    const node = findDOMNode(this.bigTextRef.current);
     const { length } = node.innerText;
 
     const styles = {
diff --git a/src/scripts/blocks/logo-list/InnerDisplayComponent.js b/src/scripts/blocks/logo-list/InnerDisplayComponent.js
index 41ab424..187d3fc 100644
--- a/src/scripts/blocks/logo-list/InnerDisplayComponent.js
+++ b/src/scripts/blocks/logo-list/InnerDisplayComponent.js
@@ -1,7 +1,6 @@
 /**
  * Third-party
  */
-import React from 'react';
 import classnames from 'classnames';
 import pick from 'lodash-es/pick';
 
@@ -9,7 +8,7 @@ import pick from 'lodash-es/pick';
  * WordPress
  */
 const { __ } = wp.i18n;
-const { Component, Fragment } = wp.element;
+const { Component, createRef, Fragment } = wp.element;
 const { applyFilters } = wp.hooks;
 const {
   Button,
@@ -26,7 +25,7 @@ export default class DisplayComponent extends Component {
   constructor(...params) {
     super(...params);
 
-    this.bigTextRef = React.createRef();
+    this.bigTextRef = createRef();
   }
 
   getImageButton = (openEvent) => {