diff --git a/assets/images/svg/social-icons.svg b/assets/images/svg/social-icons.svg
index 920f990..89ed48a 100644
--- a/assets/images/svg/social-icons.svg
+++ b/assets/images/svg/social-icons.svg
@@ -67,6 +67,10 @@
 			<path d="M13.714 2.286q3.732 0 6.884 1.839t4.991 4.991 1.839 6.884q0 4.482-2.616 8.063t-6.759 4.955q-0.482 0.089-0.714-0.125t-0.232-0.536q0-0.054 0.009-1.366t0.009-2.402q0-1.732-0.929-2.536 1.018-0.107 1.83-0.321t1.679-0.696 1.446-1.188 0.946-1.875 0.366-2.688q0-2.125-1.411-3.679 0.661-1.625-0.143-3.643-0.5-0.161-1.446 0.196t-1.643 0.786l-0.679 0.429q-1.661-0.464-3.429-0.464t-3.429 0.464q-0.286-0.196-0.759-0.482t-1.491-0.688-1.518-0.241q-0.804 2.018-0.143 3.643-1.411 1.554-1.411 3.679 0 1.518 0.366 2.679t0.938 1.875 1.438 1.196 1.679 0.696 1.83 0.321q-0.696 0.643-0.875 1.839-0.375 0.179-0.804 0.268t-1.018 0.089-1.17-0.384-0.991-1.116q-0.339-0.571-0.866-0.929t-0.884-0.429l-0.357-0.054q-0.375 0-0.518 0.080t-0.089 0.205 0.161 0.25 0.232 0.214l0.125 0.089q0.393 0.179 0.777 0.679t0.563 0.911l0.179 0.411q0.232 0.679 0.786 1.098t1.196 0.536 1.241 0.125 0.991-0.063l0.411-0.071q0 0.679 0.009 1.58t0.009 0.973q0 0.321-0.232 0.536t-0.714 0.125q-4.143-1.375-6.759-4.955t-2.616-8.063q0-3.732 1.839-6.884t4.991-4.991 6.884-1.839zM5.196 21.982q0.054-0.125-0.125-0.214-0.179-0.054-0.232 0.036-0.054 0.125 0.125 0.214 0.161 0.107 0.232-0.036zM5.75 22.589q0.125-0.089-0.036-0.286-0.179-0.161-0.286-0.054-0.125 0.089 0.036 0.286 0.179 0.179 0.286 0.054zM6.286 23.393q0.161-0.125 0-0.339-0.143-0.232-0.304-0.107-0.161 0.089 0 0.321t0.304 0.125zM7.036 24.143q0.143-0.143-0.071-0.339-0.214-0.214-0.357-0.054-0.161 0.143 0.071 0.339 0.214 0.214 0.357 0.054zM8.054 24.589q0.054-0.196-0.232-0.286-0.268-0.071-0.339 0.125t0.232 0.268q0.268 0.107 0.339-0.107zM9.179 24.679q0-0.232-0.304-0.196-0.286 0-0.286 0.196 0 0.232 0.304 0.196 0.286 0 0.286-0.196zM10.214 24.5q-0.036-0.196-0.321-0.161-0.286 0.054-0.25 0.268t0.321 0.143 0.25-0.25z"></path>
 		</symbol>
 
+		<symbol id="social-icon-google" viewBox="0 0 27 32">
+			<path d="M13.714 14.036h12.946c0.125 0.696 0.214 1.375 0.214 2.286 0 7.821-5.25 13.393-13.161 13.393-7.589 0-13.714-6.125-13.714-13.714s6.125-13.714 13.714-13.714c3.696 0 6.804 1.357 9.196 3.589l-3.732 3.589c-1.018-0.982-2.804-2.125-5.464-2.125-4.679 0-8.5 3.875-8.5 8.661s3.821 8.661 8.5 8.661c5.429 0 7.464-3.893 7.786-5.911h-7.786v-4.714z"></path>
+		</symbol>
+
 		<symbol id="social-icon-google-plus" viewBox="0 0 41 32">
 			<path d="M25.661 16.304q0 3.714-1.554 6.616t-4.429 4.536-6.589 1.634q-2.661 0-5.089-1.036t-4.179-2.786-2.786-4.179-1.036-5.089 1.036-5.089 2.786-4.179 4.179-2.786 5.089-1.036q5.107 0 8.768 3.429l-3.554 3.411q-2.089-2.018-5.214-2.018-2.196 0-4.063 1.107t-2.955 3.009-1.089 4.152 1.089 4.152 2.955 3.009 4.063 1.107q1.482 0 2.723-0.411t2.045-1.027 1.402-1.402 0.875-1.482 0.384-1.321h-7.429v-4.5h12.357q0.214 1.125 0.214 2.179zM41.143 14.125v3.75h-3.732v3.732h-3.75v-3.732h-3.732v-3.75h3.732v-3.732h3.75v3.732h3.732z"></path>
 		</symbol>
@@ -172,6 +176,10 @@
 			<path d="M34.232 9.286q0.411 1.143-2.679 5.25-0.429 0.571-1.161 1.518-1.393 1.786-1.607 2.339-0.304 0.732 0.25 1.446 0.304 0.375 1.446 1.464h0.018l0.071 0.071q2.518 2.339 3.411 3.946 0.054 0.089 0.116 0.223t0.125 0.473-0.009 0.607-0.446 0.491-1.054 0.223l-4.571 0.071q-0.429 0.089-1-0.089t-0.929-0.393l-0.357-0.214q-0.536-0.375-1.25-1.143t-1.223-1.384-1.089-1.036-1.009-0.277q-0.054 0.018-0.143 0.063t-0.304 0.259-0.384 0.527-0.304 0.929-0.116 1.384q0 0.268-0.063 0.491t-0.134 0.33l-0.071 0.089q-0.321 0.339-0.946 0.393h-2.054q-1.268 0.071-2.607-0.295t-2.348-0.946-1.839-1.179-1.259-1.027l-0.446-0.429q-0.179-0.179-0.491-0.536t-1.277-1.625-1.893-2.696-2.188-3.768-2.33-4.857q-0.107-0.286-0.107-0.482t0.054-0.286l0.071-0.107q0.268-0.339 1.018-0.339l4.893-0.036q0.214 0.036 0.411 0.116t0.286 0.152l0.089 0.054q0.286 0.196 0.429 0.571 0.357 0.893 0.821 1.848t0.732 1.455l0.286 0.518q0.518 1.071 1 1.857t0.866 1.223 0.741 0.688 0.607 0.25 0.482-0.089q0.036-0.018 0.089-0.089t0.214-0.393 0.241-0.839 0.17-1.446 0-2.232q-0.036-0.714-0.161-1.304t-0.25-0.821l-0.107-0.214q-0.446-0.607-1.518-0.768-0.232-0.036 0.089-0.429 0.304-0.339 0.679-0.536 0.946-0.464 4.268-0.429 1.464 0.018 2.411 0.232 0.357 0.089 0.598 0.241t0.366 0.429 0.188 0.571 0.063 0.813-0.018 0.982-0.045 1.259-0.027 1.473q0 0.196-0.018 0.75t-0.009 0.857 0.063 0.723 0.205 0.696 0.402 0.438q0.143 0.036 0.304 0.071t0.464-0.196 0.679-0.616 0.929-1.196 1.214-1.92q1.071-1.857 1.911-4.018 0.071-0.179 0.179-0.313t0.196-0.188l0.071-0.054 0.089-0.045t0.232-0.054 0.357-0.009l5.143-0.036q0.696-0.089 1.143 0.045t0.554 0.295z"></path>
 		</symbol>
 
+		<symbol id="social-icon-whatsapp" viewBox="0 0 27 32">
+			<path d="M17.589 17.393c0.304 0 3.214 1.518 3.339 1.732 0.036 0.089 0.036 0.196 0.036 0.268 0 0.446-0.143 0.946-0.304 1.357-0.411 1-2.071 1.643-3.089 1.643-0.857 0-2.625-0.75-3.393-1.107-2.554-1.161-4.143-3.143-5.679-5.411-0.679-1-1.286-2.232-1.268-3.464v-0.143c0.036-1.179 0.464-2.018 1.321-2.821 0.268-0.25 0.554-0.393 0.929-0.393 0.214 0 0.429 0.054 0.661 0.054 0.482 0 0.571 0.143 0.75 0.607 0.125 0.304 1.036 2.732 1.036 2.911 0 0.679-1.232 1.446-1.232 1.857 0 0.089 0.036 0.179 0.089 0.268 0.393 0.839 1.143 1.804 1.821 2.446 0.821 0.786 1.696 1.304 2.696 1.804 0.125 0.071 0.25 0.125 0.393 0.125 0.536 0 1.429-1.732 1.893-1.732zM13.964 26.857c6.179 0 11.214-5.036 11.214-11.214s-5.036-11.214-11.214-11.214-11.214 5.036-11.214 11.214c0 2.357 0.75 4.661 2.143 6.571l-1.411 4.161 4.321-1.375c1.821 1.196 3.982 1.857 6.161 1.857zM13.964 2.179c7.429 0 13.464 6.036 13.464 13.464s-6.036 13.464-13.464 13.464c-2.268 0-4.518-0.571-6.518-1.679l-7.446 2.393 2.429-7.232c-1.268-2.089-1.929-4.5-1.929-6.946 0-7.429 6.036-13.464 13.464-13.464z"></path>
+		</symbol>
+
 		<symbol id="social-icon-wordpress" viewBox="0 0 32 32">
 			<path d="M2.268 16q0-2.911 1.196-5.589l6.554 17.946q-3.5-1.696-5.625-5.018t-2.125-7.339zM25.268 15.304q0 0.339-0.045 0.688t-0.179 0.884-0.205 0.786-0.313 1.054-0.313 1.036l-1.357 4.571-4.964-14.75q0.821-0.054 1.571-0.143 0.339-0.036 0.464-0.33t-0.045-0.554-0.509-0.241l-3.661 0.179q-1.339-0.018-3.607-0.179-0.214-0.018-0.366 0.089t-0.205 0.268-0.027 0.33 0.161 0.295 0.348 0.143l1.429 0.143 2.143 5.857-3 9-5-14.857q0.821-0.054 1.571-0.143 0.339-0.036 0.464-0.33t-0.045-0.554-0.509-0.241l-3.661 0.179q-0.125 0-0.411-0.009t-0.464-0.009q1.875-2.857 4.902-4.527t6.563-1.67q2.625 0 5.009 0.946t4.259 2.661h-0.179q-0.982 0-1.643 0.723t-0.661 1.705q0 0.214 0.036 0.429t0.071 0.384 0.143 0.411 0.161 0.375 0.214 0.402 0.223 0.375 0.259 0.429 0.25 0.411q1.125 1.911 1.125 3.786zM16.232 17.196l4.232 11.554q0.018 0.107 0.089 0.196-2.25 0.786-4.554 0.786-2 0-3.875-0.571zM28.036 9.411q1.696 3.107 1.696 6.589 0 3.732-1.857 6.884t-4.982 4.973l4.196-12.107q1.054-3.018 1.054-4.929 0-0.75-0.107-1.411zM16 0q3.25 0 6.214 1.268t5.107 3.411 3.411 5.107 1.268 6.214-1.268 6.214-3.411 5.107-5.107 3.411-6.214 1.268-6.214-1.268-5.107-3.411-3.411-5.107-1.268-6.214 1.268-6.214 3.411-5.107 5.107-3.411 6.214-1.268zM16 31.268q3.089 0 5.92-1.214t4.875-3.259 3.259-4.875 1.214-5.92-1.214-5.92-3.259-4.875-4.875-3.259-5.92-1.214-5.92 1.214-4.875 3.259-3.259 4.875-1.214 5.92 1.214 5.92 3.259 4.875 4.875 3.259 5.92 1.214z"></path>
 		</symbol>
diff --git a/changelog.md b/changelog.md
index e934219..8ed9b17 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,30 @@
 # Modern Changelog
 
+## 2.4.1
+
+* **Add**: Adding WhatsApp and Google social icon
+* **Update**: Implementing WordPress 5.2 code updates
+* **Fix**: Preventing PHP error after theme activation
+
+### Files changed:
+
+	changelog.md
+	header.php
+	readme.txt
+	style.css
+	assets/images/svg/social-icons.svg
+	includes/frontend/class-header.php
+	includes/frontend/class-menu.php
+	includes/welcome/welcome.php
+	template-parts/admin/notice-welcome.php
+	template-parts/admin/welcome-demo.php
+	template-parts/admin/welcome-footer.php
+	template-parts/admin/welcome-header.php
+	template-parts/admin/welcome-promo.php
+	template-parts/admin/welcome-quickstart.php
+	template-parts/admin/welcome-wordpress.php
+
+
 ## 2.4.0
 
 * **Update**: Navigation accessibility and touch screen functionality
diff --git a/header.php b/header.php
index 2158a97..8789727 100644
--- a/header.php
+++ b/header.php
@@ -9,7 +9,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    1.0.0
- * @version  2.4.0
+ * @version  2.4.1
  */
 
 
@@ -40,6 +40,12 @@
 
 <?php
 
+if ( function_exists( 'wp_body_open' ) ) {
+	wp_body_open();
+} else {
+	do_action( 'wp_body_open' );
+}
+
 do_action( 'tha_body_top' );
 
 if ( ! apply_filters( 'wmhook_modern_disable_header', false ) ) {
diff --git a/includes/frontend/class-header.php b/includes/frontend/class-header.php
index e2ef8d4..d3be8cf 100644
--- a/includes/frontend/class-header.php
+++ b/includes/frontend/class-header.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.4.0
+ * @version  2.4.1
  *
  * Contents:
  *
@@ -328,7 +328,7 @@ public static function site_branding() {
 		 * HTML Body classes
 		 *
 		 * @since    1.0.0
-		 * @version  2.2.0
+		 * @version  2.4.1
 		 *
 		 * @param  array $classes
 		 */
@@ -380,12 +380,6 @@ public static function body_class( $classes = array() ) {
 
 						$post_id = get_the_ID();
 
-						// Privacy Policy page
-
-							if ( (int) get_option( 'wp_page_for_privacy_policy' ) === $post_id ) {
-								$classes[] = 'page-privacy-policy';
-							}
-
 						// Has featured image?
 
 							if ( has_post_thumbnail() ) {
diff --git a/includes/frontend/class-menu.php b/includes/frontend/class-menu.php
index dbe48b6..c3b3dd8 100644
--- a/includes/frontend/class-menu.php
+++ b/includes/frontend/class-menu.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.4.0
+ * @version  2.4.1
  *
  * Contents:
  *
@@ -417,7 +417,7 @@ public static function get_menu_args_social( $items_wrap = '<ul data-id="%1$s" c
 			 * Social links supported icons
 			 *
 			 * @since    2.0.0
-			 * @version  2.2.3
+			 * @version  2.4.1
 			 */
 			public static function social_links_icons() {
 
@@ -435,7 +435,8 @@ public static function social_links_icons() {
 						'facebook.com'      => 'facebook',
 						'flickr.com'        => 'flickr',
 						'foursquare.com'    => 'foursquare',
-						'plus.google.com'   => 'google-plus',
+						'plus.google.'      => 'google-plus',
+						'google.'           => 'google',
 						'github.com'        => 'github',
 						'instagram.com'     => 'instagram',
 						'linkedin.com'      => 'linkedin',
@@ -465,6 +466,7 @@ public static function social_links_icons() {
 						'vimeo.com'         => 'vimeo',
 						'vine.co'           => 'vine',
 						'vk.com'            => 'vk',
+						'wa.me'             => 'whatsapp',
 						'wordpress.org'     => 'wordpress',
 						'wordpress.com'     => 'wordpress',
 						'xing.com'          => 'xing',
diff --git a/includes/welcome/welcome.php b/includes/welcome/welcome.php
index ec96759..76cbffe 100644
--- a/includes/welcome/welcome.php
+++ b/includes/welcome/welcome.php
@@ -6,7 +6,7 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.2.0
+ * @version  2.4.1
  *
  * Contents:
  *
@@ -24,7 +24,8 @@
 
 	if (
 		! is_admin()
-		|| ! Modern_Library_Customize::get_theme_mod( 'admin_welcome_page' )
+		// Modern_Library_Customize::get_theme_mod() does not work here yet.
+		|| ! get_theme_mod( 'admin_welcome_page', true )
 	) {
 		return;
 	}
diff --git a/readme.txt b/readme.txt
index fccb820..6ce36b5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: webmandesign
 Tags: one-column, two-columns, right-sidebar, grid-layout, flexible-header, accessibility-ready, custom-background, custom-colors, custom-header, custom-menu, custom-logo, editor-style, featured-image-header, featured-images, footer-widgets, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, blog, portfolio
 Requires at least: 4.7.0
-Tested up to: 5.1.1
-Stable tag: 2.4.0
+Tested up to: 5.2
+Stable tag: 2.4.1
 License: GNU General Public License v3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -37,8 +37,8 @@ Please see `changelog.md` file.
 
 == Upgrade Notice ==
 
-= 2.4.0 =
-Improving accessibility, updating info, improving excerpt display, improving CSS variables functionality, fixing Gallery post format slideshow issue with new WordPress block editor.
+= 2.4.1 =
+Implementing WordPress 5.2 code updates, adding WhatsApp and Google social icon, preventing PHP error after theme activation.
 
 
 == Resources ==
diff --git a/style.css b/style.css
index 61889ef..4e9c970 100644
--- a/style.css
+++ b/style.css
@@ -3,7 +3,7 @@ Theme Name:   Modern
 Theme URI:    https://www.webmandesign.eu/portfolio/modern-wordpress-theme/
 Author:       WebMan Design
 Author URI:   https://www.webmandesign.eu/
-Version:      2.4.0
+Version:      2.4.1
 Text Domain:  modern
 Domain Path:  /languages
 License:      GNU General Public License v3
diff --git a/template-parts/admin/notice-welcome.php b/template-parts/admin/notice-welcome.php
index 0ed936b..7d7c9db 100644
--- a/template-parts/admin/notice-welcome.php
+++ b/template-parts/admin/notice-welcome.php
@@ -6,13 +6,20 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.4.0
+ * @version  2.4.1
  */
 
 
 
 
 
+// Requirements check
+
+	if ( ! class_exists( 'Modern_Welcome' ) ) {
+		return;
+	}
+
+
 // Helper variables
 
 	$theme_name = wp_get_theme( 'modern' )->get( 'Name' );
diff --git a/template-parts/admin/welcome-demo.php b/template-parts/admin/welcome-demo.php
index f5cef09..fa1384a 100644
--- a/template-parts/admin/welcome-demo.php
+++ b/template-parts/admin/welcome-demo.php
@@ -8,13 +8,20 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.0.0
+ * @version  2.4.1
  */
 
 
 
 
 
+// Requirements check
+
+	if ( ! class_exists( 'Modern_Welcome' ) ) {
+		return;
+	}
+
+
 ?>
 
 <div class="wm-notes special">
diff --git a/template-parts/admin/welcome-footer.php b/template-parts/admin/welcome-footer.php
index 058bd37..a3a28ca 100644
--- a/template-parts/admin/welcome-footer.php
+++ b/template-parts/admin/welcome-footer.php
@@ -8,13 +8,20 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.4.0
+ * @version  2.4.1
  */
 
 
 
 
 
+// Requirements check
+
+	if ( ! class_exists( 'Modern_Welcome' ) ) {
+		return;
+	}
+
+
 ?>
 
 </div> <!-- /.welcome-content -->
diff --git a/template-parts/admin/welcome-header.php b/template-parts/admin/welcome-header.php
index 753d6a7..ed76cef 100644
--- a/template-parts/admin/welcome-header.php
+++ b/template-parts/admin/welcome-header.php
@@ -8,13 +8,20 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.4.0
+ * @version  2.4.1
  */
 
 
 
 
 
+// Requirements check
+
+	if ( ! class_exists( 'Modern_Welcome' ) ) {
+		return;
+	}
+
+
 ?>
 
 <div class="wm-notes special">
diff --git a/template-parts/admin/welcome-promo.php b/template-parts/admin/welcome-promo.php
index 4c66456..3a66260 100644
--- a/template-parts/admin/welcome-promo.php
+++ b/template-parts/admin/welcome-promo.php
@@ -8,13 +8,20 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.4.0
+ * @version  2.4.1
  */
 
 
 
 
 
+// Requirements check
+
+	if ( ! class_exists( 'Modern_Welcome' ) ) {
+		return;
+	}
+
+
 ?>
 
 <div class="welcome-upgrade">
diff --git a/template-parts/admin/welcome-quickstart.php b/template-parts/admin/welcome-quickstart.php
index d86523a..2995c41 100644
--- a/template-parts/admin/welcome-quickstart.php
+++ b/template-parts/admin/welcome-quickstart.php
@@ -8,13 +8,20 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.3.0
+ * @version  2.4.1
  */
 
 
 
 
 
+// Requirements check
+
+	if ( ! class_exists( 'Modern_Welcome' ) ) {
+		return;
+	}
+
+
 // Helper variables
 
 	$step = 0;
@@ -24,9 +31,9 @@
 
 <h2 class="screen-reader-text"><?php esc_html_e( 'Quickstart Guide', 'modern' ); ?></h2>
 
-<div class="feature-section three-col">
+<div class="feature-section three-col has-3-columns" style="max-width: none;">
 
-	<div class="first-feature col">
+	<div class="first-feature col column">
 
 		<span class="dropcap"><?php echo ++$step; ?></span>
 
@@ -46,7 +53,7 @@
 
 	</div>
 
-	<div class="second-feature col">
+	<div class="second-feature col column">
 
 		<span class="dropcap"><?php echo ++$step; ?></span>
 
@@ -72,7 +79,7 @@
 
 	</div>
 
-	<div class="last-feature col">
+	<div class="last-feature col column">
 
 		<span class="dropcap"><?php echo ++$step; ?></span>
 
diff --git a/template-parts/admin/welcome-wordpress.php b/template-parts/admin/welcome-wordpress.php
index 5c3f1c7..6a17913 100644
--- a/template-parts/admin/welcome-wordpress.php
+++ b/template-parts/admin/welcome-wordpress.php
@@ -8,13 +8,20 @@
  * @copyright  WebMan Design, Oliver Juhas
  *
  * @since    2.0.0
- * @version  2.0.0
+ * @version  2.4.1
  */
 
 
 
 
 
+// Requirements check
+
+	if ( ! class_exists( 'Modern_Welcome' ) ) {
+		return;
+	}
+
+
 ?>
 
 <div class="wm-notes special" style="padding: 2em; font-size: inherit;">