diff --git a/generators/app/templates/my-awesome-site/Gemfile b/generators/app/templates/my-awesome-site/Gemfile
index 9a6ad5b..ff2aaea 100644
--- a/generators/app/templates/my-awesome-site/Gemfile
+++ b/generators/app/templates/my-awesome-site/Gemfile
@@ -9,7 +9,7 @@ ruby RUBY_VERSION
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "3.2.1"
+gem "jekyll", "3.3.1"
 
 # If you have any plugins, put them here!
 # group :jekyll_plugins do
diff --git a/generators/app/templates/my-awesome-site/_includes/head.html b/generators/app/templates/my-awesome-site/_includes/head.html
index cea016e..df1c706 100644
--- a/generators/app/templates/my-awesome-site/_includes/head.html
+++ b/generators/app/templates/my-awesome-site/_includes/head.html
@@ -6,7 +6,7 @@
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <meta name="description" content="{{ site.description }}">
 
-    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="css/main.css">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.url }}">
-    <link rel="manifest" href="{{ "/manifest.json" | prepend: site.baseurl }}">
+    <link rel="manifest" href="manifest.json">
 </head>
diff --git a/generators/app/templates/my-awesome-site/_layouts/default.html b/generators/app/templates/my-awesome-site/_layouts/default.html
index 9346f5c..0a0641b 100644
--- a/generators/app/templates/my-awesome-site/_layouts/default.html
+++ b/generators/app/templates/my-awesome-site/_layouts/default.html
@@ -15,11 +15,11 @@
 
     {% include footer.html %}
 
-  <link async href="{{ "/scripts/main.min.js" | prepend: site.baseurl }}">
+  <link async href="scripts/main.min.js">
 <% if (includeSW) { -%>
   <script>
   if ('serviceWorker' in navigator) {
-    navigator.serviceWorker.register("{{ "/sw.js" | prepend: site.baseurl }}").then(function() {
+    navigator.serviceWorker.register("sw.js").then(function() {
       console.log("Service Worker Registered");
     });
   }
diff --git a/generators/app/templates/my-awesome-site/gulpfile.babel b/generators/app/templates/my-awesome-site/gulpfile.babel
index f6e42f5..f5a5583 100644
--- a/generators/app/templates/my-awesome-site/gulpfile.babel
+++ b/generators/app/templates/my-awesome-site/gulpfile.babel
@@ -181,20 +181,6 @@ gulp.task('build', () =>
 );
 
 <% if (includeGithub) { -%>
-// Edit config file for jekyll build.
-gulp.task('before-gh-deploy', () => {
-  return gulp.src('./_config.yml')
-    .pipe($.replace('baseurl: ""', 'baseurl: "/<%= projectName %>"'))
-    .pipe(gulp.dest('./'));
-});
-
-// Revert config file for gulp serve in local.
-gulp.task('cleanup-gh-deploy', () => {
-  return gulp.src('./_config.yml')
-    .pipe($.replace('baseurl: "/<%= projectName %>"', 'baseurl: ""'))
-    .pipe(gulp.dest('./'));
-});
-
 // Depoly website to gh-pages.
 gulp.task('gh-pages', () => {
   return gulp.src('./_site/**/*')
@@ -203,7 +189,6 @@ gulp.task('gh-pages', () => {
 
 gulp.task('deploy', () => {
   runSequence(
-    'before-gh-deploy',
 <% if (includePug) { -%>
     'pug',
 <% } -%>
@@ -217,8 +202,7 @@ gulp.task('deploy', () => {
     'generate-service-worker',
 <% } -%>
     'minify-images',
-    'gh-pages',
-    'cleanup-gh-deploy'
+    'gh-pages'
   )
 });
 <% } -%>
diff --git a/package.json b/package.json
index 41d1341..8f2242e 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "generator-jekyll-starter-kit",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "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",
-    "url": "http://nirgn.com"
+    "url": "http://www.nirgn.com"
   },
   "files": [
     "generators"
@@ -36,7 +36,7 @@
   },
   "devDependencies": {
     "eslint": "^3.1.1",
-    "eslint-config-xo-space": "^0.14.0",
+    "eslint-config-xo-space": "^0.15.0",
     "gulp": "^3.9.0",
     "gulp-coveralls": "^0.1.0",
     "gulp-eslint": "^3.0.1",