diff --git a/.travis.yml b/.travis.yml
index 86db393..6f3eda2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 sudo: false
 language: node_js
 node_js:
+  - v7
   - v6
-  - v5
-  - v4
diff --git a/LICENSE b/LICENSE
index 9c2b94a..84a46ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016 Nir Galon <nirgn975@gmail.com> (http://nirgn.com)
+Copyright (c) 2017 Nir Galon <nir@galon.io> (http://www.nirgn.com)
 
 Permission to use, copy, modify, and/or distribute this software for
 any purpose with or without fee is hereby granted, provided that the
diff --git a/README.md b/README.md
index e57abce..ceb520f 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,10 @@
 <img src="https://raw.githubusercontent.com/nirgn975/generator-jekyll-starter-kit/master/images/jekyll-starter-kit.png" />
 
 
-[![license][license-image]][license-url] [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][daviddm-image]][daviddm-url] [![Coverage percentage][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/jekyll_starter_kit/Lobby][gitter-image]][gitter-url] [![Donate][donate-image]][donate-url]
+[![license][license-image]][license-url] [![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![Dependency Status][dependencyci-image]][dependencyci-url] [![Coverage percentage][coveralls-image]][coveralls-url] [![Join the chat at https://gitter.im/jekyll_starter_kit/Lobby][gitter-image]][gitter-url] [![Donate][donate-image]][donate-url]
 
 > Jekyll + Google web-starter-kit = best of both worlds
 
----
-
 ## Installation
 
 First, install [Yeoman](http://yeoman.io) and jekyll-starter-kit using [npm](https://www.npmjs.com/) (we assume you have pre-installed [node.js](https://nodejs.org/)).
@@ -43,8 +41,8 @@ Great! Here is how you can install the local generator to test changes.
 [npm-url]: https://npmjs.org/package/generator-jekyll-starter-kit
 [travis-image]: https://travis-ci.org/nirgn975/generator-jekyll-starter-kit.svg?branch=master
 [travis-url]: https://travis-ci.org/nirgn975/generator-jekyll-starter-kit
-[daviddm-image]: https://david-dm.org/nirgn975/generator-jekyll-starter-kit.svg?theme=shields.io
-[daviddm-url]: https://david-dm.org/nirgn975/generator-jekyll-starter-kit
+[dependencyci-image]: https://dependencyci.com/github/nirgn975/generator-jekyll-starter-kit/badge
+[dependencyci-url]: https://dependencyci.com/github/nirgn975/generator-jekyll-starter-kit
 [coveralls-image]: https://coveralls.io/repos/nirgn975/generator-jekyll-starter-kit/badge.svg
 [coveralls-url]: https://coveralls.io/r/nirgn975/generator-jekyll-starter-kit
 [gitter-image]: https://badges.gitter.im/generator-jekyll-starter-kit/Lobby.svg
diff --git a/generators/app/index.js b/generators/app/index.js
index bcc82bf..1534afb 100644
--- a/generators/app/index.js
+++ b/generators/app/index.js
@@ -1,9 +1,9 @@
 'use strict';
-var yeoman = require('yeoman-generator');
+var Generator = require('yeoman-generator');
 var chalk = require('chalk');
 var yosay = require('yosay');
 
-module.exports = yeoman.Base.extend({
+module.exports = Generator.extend({
   prompting: function () {
     // Have Yeoman greet the user.
     this.log(yosay(
@@ -384,8 +384,6 @@ module.exports = yeoman.Base.extend({
       console.log('\n\n\tPlease visit https://console.firebase.google.com to create a new project, then run ' + chalk.blue('firebase use --add') + '\n');
     }
 
-    this.installDependencies({
-      bower: false
-    });
+    this.installDependencies();
   }
 });
diff --git a/generators/app/templates/my-awesome-site/.babelrc b/generators/app/templates/my-awesome-site/.babelrc
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/404.html b/generators/app/templates/my-awesome-site/404.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/Gemfile b/generators/app/templates/my-awesome-site/Gemfile
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/LICENSE b/generators/app/templates/my-awesome-site/LICENSE
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/README.md b/generators/app/templates/my-awesome-site/README.md
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_config.yml b/generators/app/templates/my-awesome-site/_config.yml
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_includes-pug/example.pug b/generators/app/templates/my-awesome-site/_includes-pug/example.pug
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_includes/footer.html b/generators/app/templates/my-awesome-site/_includes/footer.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_includes/head.html b/generators/app/templates/my-awesome-site/_includes/head.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_includes/header.html b/generators/app/templates/my-awesome-site/_includes/header.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_layouts/default.html b/generators/app/templates/my-awesome-site/_layouts/default.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_layouts/page.html b/generators/app/templates/my-awesome-site/_layouts/page.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_layouts/post.html b/generators/app/templates/my-awesome-site/_layouts/post.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_posts/2016-09-08-welcome-to-jekyll.md b/generators/app/templates/my-awesome-site/_posts/2016-09-08-welcome-to-jekyll.md
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/_scripts/main b/generators/app/templates/my-awesome-site/_scripts/main
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/about.md b/generators/app/templates/my-awesome-site/about.md
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/css/main.css b/generators/app/templates/my-awesome-site/css/main.css
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/feed.xml b/generators/app/templates/my-awesome-site/feed.xml
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/firebase b/generators/app/templates/my-awesome-site/firebase
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/firebaserc b/generators/app/templates/my-awesome-site/firebaserc
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/gitignore b/generators/app/templates/my-awesome-site/gitignore
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/gulpfile.babel b/generators/app/templates/my-awesome-site/gulpfile.babel
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/humans.txt b/generators/app/templates/my-awesome-site/humans.txt
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/images/touch/apple-touch-icon.png b/generators/app/templates/my-awesome-site/images/touch/apple-touch-icon.png
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/images/touch/chrome-touch-icon-192x192.png b/generators/app/templates/my-awesome-site/images/touch/chrome-touch-icon-192x192.png
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/images/touch/icon-128x128.png b/generators/app/templates/my-awesome-site/images/touch/icon-128x128.png
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/images/touch/ms-touch-icon-144x144-precomposed.png b/generators/app/templates/my-awesome-site/images/touch/ms-touch-icon-144x144-precomposed.png
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/index.html b/generators/app/templates/my-awesome-site/index.html
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/manifest.json b/generators/app/templates/my-awesome-site/manifest.json
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/manifest.webapp b/generators/app/templates/my-awesome-site/manifest.webapp
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/package.json b/generators/app/templates/my-awesome-site/package.json
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/robots.txt b/generators/app/templates/my-awesome-site/robots.txt
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/sass/_base.sass b/generators/app/templates/my-awesome-site/sass/_base.sass
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/sass/_layout.sass b/generators/app/templates/my-awesome-site/sass/_layout.sass
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/sass/_syntax-highlighting.sass b/generators/app/templates/my-awesome-site/sass/_syntax-highlighting.sass
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/sass/main.sass b/generators/app/templates/my-awesome-site/sass/main.sass
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/scss/_base.scss b/generators/app/templates/my-awesome-site/scss/_base.scss
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/scss/_layout.scss b/generators/app/templates/my-awesome-site/scss/_layout.scss
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/scss/_syntax-highlighting.scss b/generators/app/templates/my-awesome-site/scss/_syntax-highlighting.scss
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/scss/main.scss b/generators/app/templates/my-awesome-site/scss/main.scss
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/travis b/generators/app/templates/my-awesome-site/travis
old mode 100644
new mode 100755
diff --git a/generators/app/templates/my-awesome-site/validate/checklog b/generators/app/templates/my-awesome-site/validate/checklog
old mode 100644
new mode 100755
diff --git a/gulpfile.js b/gulpfile.js
index c809d63..4840c9d 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -12,23 +12,7 @@ var coveralls = require('gulp-coveralls');
 gulp.task('static', function () {
   return gulp.src('**/*.js')
     .pipe(excludeGitignore())
-    .pipe(eslint({
-      ecmaFeatures: {
-        modules: true
-      },
-      baseConfig: {
-        // parser: 'babel-eslint',
-      },
-      rules: {
-        'new-cap': ['off']
-      },
-      envs: [
-        'browser', 'es6'
-      ],
-      parserOptions: {
-        sourceType: 'module'
-      }
-    }))
+    .pipe(eslint())
     .pipe(eslint.format())
     .pipe(eslint.failAfterError());
 });
diff --git a/images/jekyll-starter-kit.png b/images/jekyll-starter-kit.png
old mode 100644
new mode 100755
diff --git a/images/jekyll-starter-kit.psd b/images/jekyll-starter-kit.psd
old mode 100644
new mode 100755
diff --git a/package.json b/package.json
index 8f2242e..0539af9 100644
--- a/package.json
+++ b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "generator-jekyll-starter-kit",
-  "version": "1.0.7",
+  "version": "2.0.0",
   "description": "Combine Jekyll and Google web-starter-kit to enjoy the best of both worlds",
   "homepage": "https://github.com/nirgn975/generator-jekyll-starter-kit",
   "author": {
     "name": "Nir Galon",
-    "email": "nirgn975@gmail.com",
+    "email": "nir@galon.io",
     "url": "http://www.nirgn.com"
   },
   "files": [
@@ -30,24 +30,24 @@
     "yeoman-generator"
   ],
   "dependencies": {
-    "yeoman-generator": "^0.24.1",
-    "chalk": "^1.0.0",
-    "yosay": "^1.0.0"
+    "yeoman-generator": "^1.0.0",
+    "chalk": "^1.1.3",
+    "yosay": "^1.2.1"
   },
   "devDependencies": {
+    "yeoman-test": "^1.6.0",
+    "yeoman-assert": "^2.2.1",
     "eslint": "^3.1.1",
     "eslint-config-xo-space": "^0.15.0",
     "gulp": "^3.9.0",
-    "gulp-coveralls": "^0.1.0",
     "gulp-eslint": "^3.0.1",
     "gulp-exclude-gitignore": "^1.0.0",
-    "gulp-istanbul": "^1.0.0",
     "gulp-line-ending-corrector": "^1.0.1",
+    "gulp-istanbul": "^1.0.0",
     "gulp-mocha": "^3.0.1",
-    "gulp-nsp": "^2.1.0",
     "gulp-plumber": "^1.0.0",
-    "yeoman-assert": "^2.0.0",
-    "yeoman-test": "^1.0.0"
+    "gulp-nsp": "^2.1.0",
+    "gulp-coveralls": "^0.1.0"
   },
   "eslintConfig": {
     "extends": "xo-space",
diff --git a/test/app.js b/test/app.js
index 7e50a6f..0000ce1 100644
--- a/test/app.js
+++ b/test/app.js
@@ -61,7 +61,7 @@ describe('generator-html-css-es2015-sw-travis', function () {
   });
 
   it('fills package.json with correct information', function () {
-    assert.JSONFileContent('package.json', {
+    assert.jsonFileContent('package.json', {
       name: 'name',
       description: 'description',
       author: 'username',