diff --git a/lib/Config/Populator.php b/lib/Config/Populator.php
index be1a748609..6f21300eb7 100644
--- a/lib/Config/Populator.php
+++ b/lib/Config/Populator.php
@@ -77,7 +77,7 @@ class Populator {
       'ScienceWeekly',
 
       'BrandingAgencyNews',
-      'CityNews',
+      'CityLocalNews',
       'College',
       'ComputerRepair',
       'Engineering',
@@ -86,7 +86,7 @@ class Populator {
       'PrimarySchool',
       'RenewableEnergy',
       'Software',
-      'WordpressTheme',
+      'WordPressTheme',
 
       'WineCity',
       'DogFood',
diff --git a/lib/Config/PopulatorData/Templates/CityNews.php b/lib/Config/PopulatorData/Templates/CityLocalNews.php
old mode 100644
new mode 100755
similarity index 98%
rename from lib/Config/PopulatorData/Templates/CityNews.php
rename to lib/Config/PopulatorData/Templates/CityLocalNews.php
index 9d8bc28b41..f3a7945731
--- a/lib/Config/PopulatorData/Templates/CityNews.php
+++ b/lib/Config/PopulatorData/Templates/CityLocalNews.php
@@ -2,19 +2,19 @@
 
 namespace MailPoet\Config\PopulatorData\Templates;
 
-class CityNews {
+class CityLocalNews {
 
   private $template_image_url;
   private $social_icon_url;
 
   function __construct($assets_url) {
-    $this->template_image_url = 'https://ps.w.org/mailpoet/assets/newsletter-templates/city-news';
+    $this->template_image_url = 'https://ps.w.org/mailpoet/assets/newsletter-templates/city-local-news';
     $this->social_icon_url = $assets_url . '/img/newsletter_editor/social-icons';
   }
 
   function get() {
     return array(
-      'name' => __("City News", 'mailpoet'),
+      'name' => __("City / Local News", 'mailpoet'),
       'categories' => json_encode(array('standard', 'all')),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
@@ -139,7 +139,7 @@ class CityNews {
             array (
               'block' => 
               array (
-                'backgroundColor' => '#ffffff',
+                'backgroundColor' => '#000000',
               ),
             ),
             'blocks' => 
@@ -209,7 +209,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Facebook.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Facebook.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -219,7 +219,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Twitter.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Twitter.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -229,7 +229,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'email',
                         'link' => '',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Email.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Email.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Email',
@@ -239,7 +239,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'youtube',
                         'link' => 'http://www.youtube.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Youtube.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Youtube.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Youtube',
@@ -1068,7 +1068,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Facebook.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Facebook.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -1078,7 +1078,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Twitter.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Twitter.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -1088,7 +1088,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'email',
                         'link' => '',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Email.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Email.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Email',
@@ -1098,7 +1098,7 @@ class CityNews {
                         'type' => 'socialIcon',
                         'iconType' => 'youtube',
                         'link' => 'http://www.youtube.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Youtube.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Youtube.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Youtube',
diff --git a/lib/Config/PopulatorData/Templates/Engineering.php b/lib/Config/PopulatorData/Templates/Engineering.php
old mode 100644
new mode 100755
index d4760346ac..611e7ed58b
--- a/lib/Config/PopulatorData/Templates/Engineering.php
+++ b/lib/Config/PopulatorData/Templates/Engineering.php
@@ -384,7 +384,7 @@ class Engineering {
             'orientation' => 'horizontal',
             'image' => 
             array (
-              'src' => $this->template_image_url . '/Engineering-Footer-1.jpg',
+              'src' => NULL,
               'display' => 'scale',
             ),
             'styles' => 
@@ -434,13 +434,18 @@ class Engineering {
                   ),
                   2 => 
                   array (
-                    'type' => 'spacer',
+                    'type' => 'image',
+                    'link' => '',
+                    'src' => $this->template_image_url . '/Engineering-Footer-c.jpg',
+                    'alt' => 'Engineering-Footer-c',
+                    'fullWidth' => true,
+                    'width' => '928px',
+                    'height' => '661px',
                     'styles' => 
                     array (
                       'block' => 
                       array (
-                        'backgroundColor' => 'transparent',
-                        'height' => '350px',
+                        'textAlign' => 'center',
                       ),
                     ),
                   ),
@@ -700,7 +705,7 @@ class Engineering {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => $this->social_icon_url . '/03-circles/Facebook.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/03-circles/Facebook.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -710,7 +715,7 @@ class Engineering {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => $this->social_icon_url . '/03-circles/Twitter.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/03-circles/Twitter.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -720,7 +725,7 @@ class Engineering {
                         'type' => 'socialIcon',
                         'iconType' => 'instagram',
                         'link' => 'http://instagram.com',
-                        'image' => $this->social_icon_url . '/03-circles/Instagram.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/03-circles/Instagram.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Instagram',
diff --git a/lib/Config/PopulatorData/Templates/WordpressTheme.php b/lib/Config/PopulatorData/Templates/WordPressTheme.php
old mode 100644
new mode 100755
similarity index 98%
rename from lib/Config/PopulatorData/Templates/WordpressTheme.php
rename to lib/Config/PopulatorData/Templates/WordPressTheme.php
index 70613723db..ddac8b3872
--- a/lib/Config/PopulatorData/Templates/WordpressTheme.php
+++ b/lib/Config/PopulatorData/Templates/WordPressTheme.php
@@ -2,19 +2,19 @@
 
 namespace MailPoet\Config\PopulatorData\Templates;
 
-class WordpressTheme {
+class WordPressTheme {
 
   private $template_image_url;
   private $social_icon_url;
 
   function __construct($assets_url) {
-    $this->template_image_url = 'https://ps.w.org/mailpoet/assets/newsletter-templates/wordpress-theme';
+    $this->template_image_url = 'https://ps.w.org/mailpoet/assets/newsletter-templates/word-press-theme';
     $this->social_icon_url = $assets_url . '/img/newsletter_editor/social-icons';
   }
 
   function get() {
     return array(
-      'name' => __("Wordpress Theme", 'mailpoet'),
+      'name' => __("WordPress Theme", 'mailpoet'),
       'categories' => json_encode(array('standard', 'all')),
       'readonly' => 1,
       'thumbnail' => $this->getThumbnail(),
@@ -278,7 +278,7 @@ class WordpressTheme {
                         'type' => 'socialIcon',
                         'iconType' => 'facebook',
                         'link' => 'http://www.facebook.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Facebook.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Facebook.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Facebook',
@@ -288,7 +288,7 @@ class WordpressTheme {
                         'type' => 'socialIcon',
                         'iconType' => 'twitter',
                         'link' => 'http://www.twitter.com',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Twitter.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Twitter.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Twitter',
@@ -298,7 +298,7 @@ class WordpressTheme {
                         'type' => 'socialIcon',
                         'iconType' => 'website',
                         'link' => '',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Website.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Website.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Website',
@@ -308,7 +308,7 @@ class WordpressTheme {
                         'type' => 'socialIcon',
                         'iconType' => 'email',
                         'link' => '',
-                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Email.png?mailpoet_version=3.15.0',
+                        'image' => $this->social_icon_url . '/08-full-symbol-grey/Email.png',
                         'height' => '32px',
                         'width' => '32px',
                         'text' => 'Email',
@@ -326,14 +326,14 @@ class WordpressTheme {
             'orientation' => 'horizontal',
             'image' => 
             array (
-              'src' => $this->template_image_url . '/Wordpress-Header.jpg',
+              'src' => $this->template_image_url . '/Wordpress-Header-b.jpg',
               'display' => 'scale',
             ),
             'styles' => 
             array (
               'block' => 
               array (
-                'backgroundColor' => 'transparent',
+                'backgroundColor' => '#2d557f',
               ),
             ),
             'blocks' => 
@@ -376,13 +376,18 @@ class WordpressTheme {
                   ),
                   2 => 
                   array (
-                    'type' => 'spacer',
+                    'type' => 'image',
+                    'link' => '',
+                    'src' => $this->template_image_url . '/Wordpress-Header-img.png',
+                    'alt' => 'Wordpress-Header-img',
+                    'fullWidth' => false,
+                    'width' => '1134px',
+                    'height' => '898px',
                     'styles' => 
                     array (
                       'block' => 
                       array (
-                        'backgroundColor' => 'transparent',
-                        'height' => '550px',
+                        'textAlign' => 'center',
                       ),
                     ),
                   ),
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-AppleDownload.png b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-AppleDownload.png
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-AppleDownload.png
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-AppleDownload.png
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-GoogleDownload.png b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-GoogleDownload.png
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-GoogleDownload.png
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-GoogleDownload.png
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-Header.jpg b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Header.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-Header.jpg
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Header.jpg
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-Images-1.jpg b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Images-1.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-Images-1.jpg
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Images-1.jpg
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-Logo.png b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Logo.png
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-Logo.png
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Logo.png
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-Phone.png b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Phone.png
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-Phone.png
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-Phone.png
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-1.jpg b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-1.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-1.jpg
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-1.jpg
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-2.jpg b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-2.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-2.jpg
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-2.jpg
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-3.jpg b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-3.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-3.jpg
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-3.jpg
diff --git a/plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-4.jpg b/plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-4.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/city-news/CityNews-ThinImages-4.jpg
rename to plugin_repository/assets/newsletter-templates/city-local-news/CityNews-ThinImages-4.jpg
diff --git a/plugin_repository/assets/newsletter-templates/city-local-news/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/city-local-news/thumbnail.jpg
new file mode 100755
index 0000000000..40259b0642
Binary files /dev/null and b/plugin_repository/assets/newsletter-templates/city-local-news/thumbnail.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/city-news/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/city-news/thumbnail.jpg
deleted file mode 100755
index d2ecbefab8..0000000000
Binary files a/plugin_repository/assets/newsletter-templates/city-news/thumbnail.jpg and /dev/null differ
diff --git a/plugin_repository/assets/newsletter-templates/engineering/Engineering-Footer-c.jpg b/plugin_repository/assets/newsletter-templates/engineering/Engineering-Footer-c.jpg
new file mode 100755
index 0000000000..0931a1029b
Binary files /dev/null and b/plugin_repository/assets/newsletter-templates/engineering/Engineering-Footer-c.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/engineering/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/engineering/thumbnail.jpg
index 57d4fbb83d..4612bcfe8a 100755
Binary files a/plugin_repository/assets/newsletter-templates/engineering/thumbnail.jpg and b/plugin_repository/assets/newsletter-templates/engineering/thumbnail.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/farmers-market/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/farmers-market/thumbnail.jpg
old mode 100755
new mode 100644
index ac6c408a29..427c23c6ba
Binary files a/plugin_repository/assets/newsletter-templates/farmers-market/thumbnail.jpg and b/plugin_repository/assets/newsletter-templates/farmers-market/thumbnail.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Header-b.jpg b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Header-b.jpg
new file mode 100755
index 0000000000..d0a9693028
Binary files /dev/null and b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Header-b.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Header-img.png b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Header-img.png
new file mode 100755
index 0000000000..8e90135bb0
Binary files /dev/null and b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Header-img.png differ
diff --git a/plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Image-1.jpg b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Image-1.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Image-1.jpg
rename to plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Image-1.jpg
diff --git a/plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Image-2.jpg b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Image-2.jpg
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Image-2.jpg
rename to plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Image-2.jpg
diff --git a/plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Logo-Footer.png b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Logo-Footer.png
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Logo-Footer.png
rename to plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Logo-Footer.png
diff --git a/plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Logo.png b/plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Logo.png
similarity index 100%
rename from plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Logo.png
rename to plugin_repository/assets/newsletter-templates/word-press-theme/Wordpress-Logo.png
diff --git a/plugin_repository/assets/newsletter-templates/word-press-theme/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/word-press-theme/thumbnail.jpg
new file mode 100755
index 0000000000..819d2a22ed
Binary files /dev/null and b/plugin_repository/assets/newsletter-templates/word-press-theme/thumbnail.jpg differ
diff --git a/plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Header.jpg b/plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Header.jpg
deleted file mode 100755
index a552627dbb..0000000000
Binary files a/plugin_repository/assets/newsletter-templates/wordpress-theme/Wordpress-Header.jpg and /dev/null differ
diff --git a/plugin_repository/assets/newsletter-templates/wordpress-theme/thumbnail.jpg b/plugin_repository/assets/newsletter-templates/wordpress-theme/thumbnail.jpg
deleted file mode 100755
index 91bb547f09..0000000000
Binary files a/plugin_repository/assets/newsletter-templates/wordpress-theme/thumbnail.jpg and /dev/null differ