diff --git a/Gruntfile.js b/Gruntfile.js
index fc8b2e7..a4f5dec 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -29,7 +29,8 @@ module.exports = function (grunt) {
             'license_url': '<%= pkg.license.url %>',
             'name': '<%= pkg.name %>',
             'description': '<%= pkg.description %>',
-            'homepage': '<%= pkg.homepage %>'
+            'homepage': '<%= pkg.homepage %>',
+            'keywords': '<%= pkg.keywords.join(", ") %>'
           },
           prefix: '@@'
         },
diff --git a/package.json b/package.json
index 1190e10..43d768e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "SemPress",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "description": "SemPress is an extremely lightweight, responsive theme designed to show off your posts, quotes, and images. SemPress supports multiple post formats, widgets, and the option to upload a custom header or background image. The theme is based on HTML5 mixed with microformats, microformats v2 and microdata (Schema.org).",
   "main": "Gruntfile.js",
   "repository": {
@@ -11,10 +11,6 @@
     "url": "https://github.com/pfefferle/SemPress/issues"
   },
   "keywords": [
-    "white",
-    "gray",
-    "light",
-    "black",
     "custom-menu",
     "custom-colors",
     "custom-header",
diff --git a/sass/style.scss b/sass/style.scss
index 61abb64..e46a785 100644
--- a/sass/style.scss
+++ b/sass/style.scss
@@ -7,7 +7,7 @@ Description: @@description
 Version: @@version
 License: @@license Version @@license_version
 License URI: @@license_url
-Tags: white, gray, light, black, custom-menu, custom-colors, custom-header, custom-background, sticky-post, microformats, rtl-language-support, translation-ready, full-width-template, post-formats, threaded-comments, fluid-layout, right-sidebar, responsive-layout, accessibility-ready, two-columns, one-column, editor-style, featured-images, theme-options
+Tags: @@keywords
 Text Domain: sempress
 
 This theme is based on the toolbox theme (http://wordpress.org/themes/toolbox)
diff --git a/sempress/style.css b/sempress/style.css
index 18d1014..9c55767 100644
--- a/sempress/style.css
+++ b/sempress/style.css
@@ -4,10 +4,10 @@ Theme URI: https://github.com/pfefferle/SemPress
 Author: Matthias Pfefferle
 Author URI: http://notiz.blog/projects/sempress/
 Description: SemPress is an extremely lightweight, responsive theme designed to show off your posts, quotes, and images. SemPress supports multiple post formats, widgets, and the option to upload a custom header or background image. The theme is based on HTML5 mixed with microformats, microformats v2 and microdata (Schema.org).
-Version: 1.5.5
+Version: 1.5.6
 License: GNU General Public License Version 3
 License URI: http://www.gnu.org/licenses/gpl.html
-Tags: white, gray, light, black, custom-menu, custom-colors, custom-header, custom-background, sticky-post, microformats, rtl-language-support, translation-ready, full-width-template, post-formats, threaded-comments, fluid-layout, right-sidebar, responsive-layout, accessibility-ready, two-columns, one-column, editor-style, featured-images, theme-options
+Tags: custom-menu, custom-colors, custom-header, custom-background, custom-logo, sticky-post, microformats, rtl-language-support, translation-ready, full-width-template, post-formats, threaded-comments, responsive-layout, fluid-layout, right-sidebar, theme-options, two-columns, one-column, editor-style, featured-images, blog, news
 Text Domain: sempress
 
 This theme is based on the toolbox theme (http://wordpress.org/themes/toolbox)