diff --git a/README.md b/README.md
index 37deeafc..fc7a06fe 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,6 @@ See also: [Building Projects with Yeoman on docs.asp.net](https://docs.asp.net/e
 
 * `yo aspnet` shows a wizard for generating a new ASP.NET Core 1.0 app
 
-* `yo aspnet --grunt` generates `Gruntfile.js` files for **web** templates instead of `gulpfile.js`
-
 * `yo aspnet --help` shows flags and other configurable options
 
 ## Template projects
@@ -53,8 +51,7 @@ The [Docker](https://www.docker.com/) support with `Dockerfile` configuration fi
 
 The Unit test project uses [xUnit: a free, open source, community-focused unit testing tool for the .NET Framework](https://xunit.github.io/)
 
-The templates that use client side libraries and `Gulp` or `Grunt` tasks are now calling `npm install` and `bower install` script to install NPM and Bower managed dependencies. You can skip installation process by passign `--skip-install` option to generator, e.g. `yo aspnet --skip-install`. This should allow better experience when `Development` has been enabled.
-
+The templates that use client side libraries are calling `bower install` script to install Bower managed dependencies. You can skip installation process by passign `--skip-install` option to generator, e.g. `yo aspnet --skip-install`. This should allow better experience when `Development` has been enabled.
 
 ## Command line automation
 
diff --git a/app/index.js b/app/index.js
index 141d6e03..7fd39554 100644
--- a/app/index.js
+++ b/app/index.js
@@ -208,19 +208,13 @@ var AspnetGenerator = yeoman.generators.Base.extend({
 
       case 'web':
         this.sourceRoot(path.join(__dirname, '../templates/projects/' + this.type));
-        // Grunt or Gulp
-        if (this.options.grunt) {
-          this.fs.copyTpl(this.templatePath('Gruntfile.js'), this.applicationName + '/Gruntfile.js', this.templatedata);
-        } else {
-          this.fs.copyTpl(this.templatePath('gulpfile.js'), this.applicationName + '/gulpfile.js', this.templatedata);
-        }
         // individual files (configs, etc)
         this.fs.copyTpl(this.sourceRoot() + '/../../Dockerfile.txt', this.applicationName + '/Dockerfile', this.templatedata);
         this.fs.copy(this.templatePath('.bowerrc'), this.applicationName + '/.bowerrc');
         this.fs.copy(this.sourceRoot() + '/../../gitignore.txt', this.applicationName + '/.gitignore');
         this.fs.copyTpl(this.templatePath('appsettings.json'), this.applicationName + '/appsettings.json', this.templatedata);
         this.fs.copyTpl(this.templatePath('bower.json'), this.applicationName + '/bower.json', this.templatedata);
-        this.fs.copyTpl(this.templatePath('package.json'), this.applicationName + '/package.json', this.templatedata);
+        this.fs.copy(this.templatePath('bundleconfig.json'), this.applicationName + '/bundleconfig.json');
         this.fs.copyTpl(this.templatePath('Program.cs'), this.applicationName + '/Program.cs', this.templatedata);
         this.fs.copyTpl(this.templatePath('project.json'), this.applicationName + '/project.json', this.templatedata);
         this.fs.copy(this.templatePath('README.md'), this.applicationName + '/README.md');
@@ -258,19 +252,13 @@ var AspnetGenerator = yeoman.generators.Base.extend({
         break;
       case 'webbasic':
         this.sourceRoot(path.join(__dirname, '../templates/projects/' + this.type));
-        // Grunt or Gulp
-        if (this.options.grunt) {
-          this.fs.copyTpl(this.templatePath('Gruntfile.js'), this.applicationName + '/Gruntfile.js', this.templatedata);
-        } else {
-          this.fs.copyTpl(this.templatePath('gulpfile.js'), this.applicationName + '/gulpfile.js', this.templatedata);
-        }
         // individual files (configs, etc)
         this.fs.copyTpl(this.sourceRoot() + '/../../Dockerfile.txt', this.applicationName + '/Dockerfile', this.templatedata);
         this.fs.copy(this.templatePath('.bowerrc'), this.applicationName + '/.bowerrc');
+        this.fs.copy(this.templatePath('bundleconfig.json'), this.applicationName + '/bundleconfig.json');
         this.fs.copy(this.sourceRoot() + '/../../gitignore.txt', this.applicationName + '/.gitignore');
         this.fs.copyTpl(this.templatePath('bower.json'), this.applicationName + '/bower.json', this.templatedata);
         this.fs.copyTpl(this.templatePath('appsettings.json'), this.applicationName + '/appsettings.json', this.templatedata);
-        this.fs.copyTpl(this.templatePath('package.json'), this.applicationName + '/package.json', this.templatedata);
         this.fs.copyTpl(this.templatePath('project.json'), this.applicationName + '/project.json', this.templatedata);
         this.fs.copyTpl(this.templatePath('Program.cs'), this.applicationName + '/Program.cs', this.templatedata);
         // Properties
@@ -343,7 +331,7 @@ var AspnetGenerator = yeoman.generators.Base.extend({
     if(!this.options['skip-install'] && (this.type === 'web' || this.type === 'webbasic')) {
       process.chdir(this.applicationName);
       this.installDependencies({
-        npm: true,
+        npm: false,
         bower: true,
         callback: this._showUsageHints.bind(this)
       });
diff --git a/package.json b/package.json
index 1345bd68..85a4e8c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-aspnet",
-  "version": "0.0.93",
+  "version": "0.1.0",
   "description": "Yeoman generator for ASP.NET Core 1.0 apps",
   "license": "Apache-2.0",
   "main": "app/index.js",
diff --git a/templates/overrides/semantic/web/Views/Shared/_Layout.cshtml b/templates/overrides/semantic/web/Views/Shared/_Layout.cshtml
index d1596336..656cf08d 100644
--- a/templates/overrides/semantic/web/Views/Shared/_Layout.cshtml
+++ b/templates/overrides/semantic/web/Views/Shared/_Layout.cshtml
@@ -31,9 +31,9 @@
                 <span class="sr-only">Toggle Navigation</span>
             </a>
             <a href="/" class="header item"><%= namespace %></a>
-            <menulink class="blue item" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
-            <menulink class="blue item" controller-name="Home" action-name="About" menu-text="About"></menulink>
-            <menulink class="blue item" controller-name="Home" action-name="Contact" menu-text="Contact">Contact</menulink>
+            <menulink class="blue item" asp-area="" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
+            <menulink class="blue item" asp-area="" controller-name="Home" action-name="About" menu-text="About"></menulink>
+            <menulink class="blue item" asp-area="" controller-name="Home" action-name="Contact" menu-text="Contact">Contact</menulink>
 
            @await Html.PartialAsync("_LoginPartial")
         </div>
@@ -41,9 +41,9 @@
 
     <!-- Sidebar Menu -->
     <div class="ui vertical inverted sidebar menu">
-        <menulink class="blue item" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
-        <menulink class="blue item" controller-name="Home" action-name="About" menu-text="About"></menulink>
-        <menulink class="blue item" controller-name="Home" action-name="Contact" menu-text="Contact"></menulink>
+        <menulink class="blue item" asp-area="" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
+        <menulink class="blue item" asp-area="" controller-name="Home" action-name="About" menu-text="About"></menulink>
+        <menulink class="blue item" asp-area="" controller-name="Home" action-name="Contact" menu-text="Contact"></menulink>
 
         @if (SignInManager.IsSignedIn(User))
         {
diff --git a/templates/overrides/semantic/web/bundleconfig.json b/templates/overrides/semantic/web/bundleconfig.json
new file mode 100644
index 00000000..9487b167
--- /dev/null
+++ b/templates/overrides/semantic/web/bundleconfig.json
@@ -0,0 +1,31 @@
+
+[
+  {
+    "outputFileName": "wwwroot/css/site.min.css",
+    "inputFiles": [
+      "wwwroot/css/site.css"
+    ],
+    "minify": {
+      "enabled": true
+    }
+  },
+  {
+    "outputFileName": "wwwroot/js/site.min.js",
+    "inputFiles": [
+      "wwwroot/js/site.js"
+    ],
+    "minify": {
+      "enabled": true
+    }
+  },
+  {
+    "outputFileName": "wwwroot/js/semantic.validation.min.js",
+    "inputFiles": [
+      "wwwroot/js/semantic.validation.js"
+    ],
+    "minify": {
+      "enabled": true,
+      "renameLocals": true
+    }
+  }
+]
diff --git a/templates/overrides/semantic/webbasic/Views/Shared/_Layout.cshtml b/templates/overrides/semantic/webbasic/Views/Shared/_Layout.cshtml
index bbe07315..daf9657f 100644
--- a/templates/overrides/semantic/webbasic/Views/Shared/_Layout.cshtml
+++ b/templates/overrides/semantic/webbasic/Views/Shared/_Layout.cshtml
@@ -26,18 +26,18 @@
                 <span class="sr-only">Toggle Navigation</span>
             </a>
             <a href="/" class="header item"><%= namespace %></a>
-            <menulink class="blue item" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
-            <menulink class="blue item" controller-name="Home" action-name="About" menu-text="About"></menulink>
-            <menulink class="blue item" controller-name="Home" action-name="Contact" menu-text="Contact">Contact</menulink>
+            <menulink class="blue item" asp-area="" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
+            <menulink class="blue item" asp-area="" controller-name="Home" action-name="About" menu-text="About"></menulink>
+            <menulink class="blue item" asp-area="" controller-name="Home" action-name="Contact" menu-text="Contact">Contact</menulink>
 
         </div>
     </div>
 
     <!-- Sidebar Menu -->
     <div class="ui vertical inverted sidebar menu">
-        <menulink class="blue item" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
-        <menulink class="blue item" controller-name="Home" action-name="About" menu-text="About"></menulink>
-        <menulink class="blue item" controller-name="Home" action-name="Contact" menu-text="Contact"></menulink>
+        <menulink class="blue item" asp-area="" controller-name="Home" action-name="Index" menu-text="Home"></menulink>
+        <menulink class="blue item" asp-area="" controller-name="Home" action-name="About" menu-text="About"></menulink>
+        <menulink class="blue item" asp-area="" controller-name="Home" action-name="Contact" menu-text="Contact"></menulink>
 
     </div>
 
diff --git a/templates/overrides/semantic/webbasic/bundleconfig.json b/templates/overrides/semantic/webbasic/bundleconfig.json
new file mode 100644
index 00000000..937a1014
--- /dev/null
+++ b/templates/overrides/semantic/webbasic/bundleconfig.json
@@ -0,0 +1,30 @@
+[
+  {
+    "outputFileName": "wwwroot/css/site.min.css",
+    "inputFiles": [
+      "wwwroot/css/site.css"
+    ],
+    "minify": {
+      "enabled": true
+    }
+  },
+  {
+    "outputFileName": "wwwroot/js/site.min.js",
+    "inputFiles": [
+      "wwwroot/js/site.js"
+    ],
+    "minify": {
+      "enabled": true
+    }
+  },
+  {
+    "outputFileName": "wwwroot/js/semantic.validation.min.js",
+    "inputFiles": [
+      "wwwroot/js/semantic.validation.js"
+    ],
+    "minify": {
+      "enabled": true,
+      "renameLocals": true
+    }
+  }
+]
diff --git a/templates/projects/classlibrary/class.cs b/templates/projects/classlibrary/class.cs
index 9ad14983..95a82752 100644
--- a/templates/projects/classlibrary/class.cs
+++ b/templates/projects/classlibrary/class.cs
@@ -5,8 +5,6 @@
 
 namespace <%= namespace %>
 {
-    // This project can output the Class library as a NuGet Package.
-    // To enable this option, right-click on the project and select the Properties menu item. In the Build tab select "Produce outputs on build".
     public class Class1
     {
         public Class1()
diff --git a/templates/projects/emptyweb/project.json b/templates/projects/emptyweb/project.json
index c95809f5..6abaf2ce 100644
--- a/templates/projects/emptyweb/project.json
+++ b/templates/projects/emptyweb/project.json
@@ -27,11 +27,18 @@
 
   "buildOptions": {
     "emitEntryPoint": true,
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+     "compile": {
+      "exclude": [
+        "node_modules"
+      ]
+    }
   },
 
   "runtimeOptions": {
-    "gcServer": true
+    "configProperties": {
+      "System.GC.Server": true
+    }
   },
 
   "publishOptions": {
diff --git a/templates/projects/unittest/project.json b/templates/projects/unittest/project.json
index 970aa963..3beba008 100644
--- a/templates/projects/unittest/project.json
+++ b/templates/projects/unittest/project.json
@@ -2,7 +2,12 @@
   "version": "1.0.0-*",
 
   "buildOptions": {
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+     "compile": {
+      "exclude": [
+        "node_modules"
+      ]
+    }
   },
 
   "dependencies": {
diff --git a/templates/projects/web/Controllers/ManageController.cs b/templates/projects/web/Controllers/ManageController.cs
index c1bd3138..546928f8 100755
--- a/templates/projects/web/Controllers/ManageController.cs
+++ b/templates/projects/web/Controllers/ManageController.cs
@@ -22,11 +22,11 @@ public class ManageController : Controller
         private readonly ILogger _logger;
 
         public ManageController(
-        UserManager<ApplicationUser> userManager,
-        SignInManager<ApplicationUser> signInManager,
-        IEmailSender emailSender,
-        ISmsSender smsSender,
-        ILoggerFactory loggerFactory)
+            UserManager<ApplicationUser> userManager,
+            SignInManager<ApplicationUser> signInManager,
+            IEmailSender emailSender,
+            ISmsSender smsSender,
+            ILoggerFactory loggerFactory)
         {
             _userManager = userManager;
             _signInManager = signInManager;
diff --git a/templates/projects/web/Gruntfile.js b/templates/projects/web/Gruntfile.js
deleted file mode 100644
index 27b3117e..00000000
--- a/templates/projects/web/Gruntfile.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-  This file is the main entry point for defining grunt tasks and using grunt plugins.
-  Click here to learn more: https://docs.asp.net/en/latest/client-side/using-grunt.html
-*/
-"use strict";
-
-module.exports = function(grunt) {
-  grunt.initConfig({
-  });
-};
diff --git a/templates/projects/web/Views/Shared/_Layout.cshtml b/templates/projects/web/Views/Shared/_Layout.cshtml
index a8e70293..95fb72c2 100755
--- a/templates/projects/web/Views/Shared/_Layout.cshtml
+++ b/templates/projects/web/Views/Shared/_Layout.cshtml
@@ -26,13 +26,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand"><%= namespace %></a>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand"><%= namespace %></a>
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a asp-controller="Home" asp-action="Index">Home</a></li>
-                    <li><a asp-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
                 </ul>
                 @await Html.PartialAsync("_LoginPartial")
             </div>
diff --git a/templates/projects/web/bundleconfig.json b/templates/projects/web/bundleconfig.json
new file mode 100644
index 00000000..b6af0938
--- /dev/null
+++ b/templates/projects/web/bundleconfig.json
@@ -0,0 +1,22 @@
+
+[
+  {
+    "outputFileName": "wwwroot/css/site.min.css",
+    "inputFiles": [
+      "wwwroot/css/site.css"
+    ],
+    "minify": {
+      "enabled": true
+    }
+  },
+  {
+    "outputFileName": "wwwroot/js/site.min.js",
+    "inputFiles": [
+      "wwwroot/js/site.js"
+    ],
+    "minify": {
+      "enabled": true,
+      "renameLocals": true
+    }
+  }
+]
diff --git a/templates/projects/web/gulpfile.js b/templates/projects/web/gulpfile.js
deleted file mode 100755
index faf29554..00000000
--- a/templates/projects/web/gulpfile.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/// <binding Clean='clean' />
-"use strict";
-
-var gulp = require("gulp"),
-    rimraf = require("rimraf"),
-    concat = require("gulp-concat"),
-    cssmin = require("gulp-cssmin"),
-    uglify = require("gulp-uglify");
-
-var webroot = "./wwwroot/";
-
-var paths = {
-    js: webroot + "js/**/*.js",
-    minJs: webroot + "js/**/*.min.js",
-    css: webroot + "css/**/*.css",
-    minCss: webroot + "css/**/*.min.css",
-    concatJsDest: webroot + "js/site.min.js",
-    concatCssDest: webroot + "css/site.min.css"
-};
-
-gulp.task("clean:js", function (cb) {
-    rimraf(paths.concatJsDest, cb);
-});
-
-gulp.task("clean:css", function (cb) {
-    rimraf(paths.concatCssDest, cb);
-});
-
-gulp.task("clean", ["clean:js", "clean:css"]);
-
-gulp.task("min:js", function () {
-    return gulp.src([paths.js, "!" + paths.minJs], { base: "." })
-        .pipe(concat(paths.concatJsDest))
-        .pipe(uglify())
-        .pipe(gulp.dest("."));
-});
-
-gulp.task("min:css", function () {
-    return gulp.src([paths.css, "!" + paths.minCss])
-        .pipe(concat(paths.concatCssDest))
-        .pipe(cssmin())
-        .pipe(gulp.dest("."));
-});
-
-gulp.task("min", ["min:js", "min:css"]);
diff --git a/templates/projects/web/package.json b/templates/projects/web/package.json
deleted file mode 100755
index 6b829202..00000000
--- a/templates/projects/web/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "<%= namespace.toLowerCase() %>",
-  "version": "0.0.0",
-  "private": true,
-  "devDependencies": {<% if(!grunt){ %>
-    "gulp": "3.9.1",
-    "gulp-concat": "2.6.0",
-    "gulp-cssmin": "0.1.7",
-    "gulp-uglify": "1.5.3",
-    "rimraf": "2.5.2"<% } %><% if(grunt){ %>
-    "grunt": "1.0.1"<% } %>
-  }
-}
diff --git a/templates/projects/web/project.json b/templates/projects/web/project.json
index 26cd32a0..ee545064 100755
--- a/templates/projects/web/project.json
+++ b/templates/projects/web/project.json
@@ -29,6 +29,7 @@
     "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
     "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
       "version": "1.0.0-preview1-final",
@@ -41,6 +42,13 @@
   },
 
   "tools": {
+    "BundlerMinifier.Core": {
+      "version": "2.0.208",
+      "imports": [
+        "portable-net45+win8+dnxcore50",
+        "portable-net40+sl5+win8+wp8+wpa81"
+      ]
+    },
     "Microsoft.AspNetCore.Razor.Tools": {
       "version": "1.0.0-preview1-final",
       "imports": "portable-net45+win8+dnxcore50"
@@ -81,11 +89,18 @@
 
   "buildOptions": {
     "emitEntryPoint": true,
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+     "compile": {
+      "exclude": [
+        "node_modules"
+      ]
+    }
   },
 
   "runtimeOptions": {
-    "gcServer": true
+    "configProperties": {
+      "System.GC.Server": true
+    }
   },
 
   "publishOptions": {
@@ -98,7 +113,8 @@
   },
 
   "scripts": {
-    "prepublish": [ "npm install", "bower install"<% if(!grunt){ %>, "gulp clean", "gulp min"<% } %> ],
+    "precompile": [ "dotnet bundle" ],
+    "prepublish": [ "bower install" ],
     "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
   },
 
diff --git a/templates/projects/web/wwwroot/css/site.css b/templates/projects/web/wwwroot/css/site.css
index 6baa84da..5933ebab 100755
--- a/templates/projects/web/wwwroot/css/site.css
+++ b/templates/projects/web/wwwroot/css/site.css
@@ -35,6 +35,12 @@ textarea {
     padding-left: 0.5em;
 }
 
+/* Make .svg files in the carousel display properly in older browsers */
+.carousel-inner .item img[src$=".svg"]
+{
+    width: 100%;
+}
+
 /* Hide/rearrange for smaller screens */
 @media screen and (max-width: 767px) {
   /* Hide captions */
diff --git a/templates/projects/web/wwwroot/css/site.min.css b/templates/projects/web/wwwroot/css/site.min.css
index c8f600ac..8c23178f 100755
--- a/templates/projects/web/wwwroot/css/site.min.css
+++ b/templates/projects/web/wwwroot/css/site.min.css
@@ -1 +1 @@
-body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.btn-bracketed::before{display:inline-block;content:"[";padding-right:.5em}.btn-bracketed::after{display:inline-block;content:"]";padding-left:.5em}@media screen and (max-width:767px){.carousel-caption{display:none}}
+body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.btn-bracketed::before{display:inline-block;content:"[";padding-right:.5em}.btn-bracketed::after{display:inline-block;content:"]";padding-left:.5em}.carousel-inner .item img[src$=".svg"]{width:100%}@media screen and (max-width:767px){.carousel-caption{display:none}}
diff --git a/templates/projects/webapi/project.json b/templates/projects/webapi/project.json
index 4d2b9b4a..b93e3460 100644
--- a/templates/projects/webapi/project.json
+++ b/templates/projects/webapi/project.json
@@ -12,7 +12,8 @@
     "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final"
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final"
   },
 
   "tools": {
@@ -34,11 +35,18 @@
 
   "buildOptions": {
     "emitEntryPoint": true,
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+     "compile": {
+      "exclude": [
+        "node_modules"
+      ]
+    }
   },
 
   "runtimeOptions": {
-    "gcServer": true
+    "configProperties": {
+      "System.GC.Server": true
+    }
   },
 
   "publishOptions": {
diff --git a/templates/projects/webbasic/Gruntfile.js b/templates/projects/webbasic/Gruntfile.js
deleted file mode 100644
index 27b3117e..00000000
--- a/templates/projects/webbasic/Gruntfile.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
-  This file is the main entry point for defining grunt tasks and using grunt plugins.
-  Click here to learn more: https://docs.asp.net/en/latest/client-side/using-grunt.html
-*/
-"use strict";
-
-module.exports = function(grunt) {
-  grunt.initConfig({
-  });
-};
diff --git a/templates/projects/webbasic/Views/Shared/_Layout.cshtml b/templates/projects/webbasic/Views/Shared/_Layout.cshtml
index 3a82859b..f522a3d8 100755
--- a/templates/projects/webbasic/Views/Shared/_Layout.cshtml
+++ b/templates/projects/webbasic/Views/Shared/_Layout.cshtml
@@ -26,13 +26,13 @@
                     <span class="icon-bar"></span>
                     <span class="icon-bar"></span>
                 </button>
-                <a asp-controller="Home" asp-action="Index" class="navbar-brand"><%= namespace %></a>
+                <a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand"><%= namespace %></a>
             </div>
             <div class="navbar-collapse collapse">
                 <ul class="nav navbar-nav">
-                    <li><a asp-controller="Home" asp-action="Index">Home</a></li>
-                    <li><a asp-controller="Home" asp-action="About">About</a></li>
-                    <li><a asp-controller="Home" asp-action="Contact">Contact</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="About">About</a></li>
+                    <li><a asp-area="" asp-controller="Home" asp-action="Contact">Contact</a></li>
                 </ul>
             </div>
         </div>
diff --git a/templates/projects/webbasic/bundleconfig.json b/templates/projects/webbasic/bundleconfig.json
new file mode 100644
index 00000000..d60e8e7d
--- /dev/null
+++ b/templates/projects/webbasic/bundleconfig.json
@@ -0,0 +1,21 @@
+[
+  {
+    "outputFileName": "wwwroot/css/site.min.css",
+    "inputFiles": [
+      "wwwroot/css/site.css"
+    ],
+    "minify": {
+      "enabled": true
+    }
+  },
+  {
+    "outputFileName": "wwwroot/js/site.min.js",
+    "inputFiles": [
+      "wwwroot/js/site.js"
+    ],
+    "minify": {
+      "enabled": true,
+      "renameLocals": true
+    }
+  }
+]
diff --git a/templates/projects/webbasic/gulpfile.js b/templates/projects/webbasic/gulpfile.js
deleted file mode 100755
index 55871e61..00000000
--- a/templates/projects/webbasic/gulpfile.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/// <binding Clean='clean' />
-"use strict";
-
-var gulp = require("gulp"),
-    rimraf = require("rimraf"),
-    concat = require("gulp-concat"),
-    cssmin = require("gulp-cssmin"),
-    uglify = require("gulp-uglify");
-
-var webroot = "./wwwroot/";
-
-var paths = {
-    js: webroot + "js/**/*.js",
-    minJs: webroot + "js/**/*.min.js",
-    css: webroot + "css/**/*.css",
-    minCss: webroot + "css/**/*.min.css",
-    concatJsDest: webroot + "js/site.min.js",
-    concatCssDest: webroot + "css/site.min.css"
-};
-
-gulp.task("clean:js", function (cb) {
-    rimraf(paths.concatJsDest, cb);
-});
-
-gulp.task("clean:css", function (cb) {
-    rimraf(paths.concatCssDest, cb);
-});
-
-gulp.task("clean", ["clean:js", "clean:css"]);
-
-gulp.task("min:js", function () {
-    return gulp.src([paths.js, "!" + paths.minJs], { base: "." })
-        .pipe(concat(paths.concatJsDest))
-        .pipe(uglify())
-        .pipe(gulp.dest("."));
-});
-
-gulp.task("min:css", function () {
-    return gulp.src([paths.css, "!" + paths.minCss])
-        .pipe(concat(paths.concatCssDest))
-        .pipe(cssmin())
-        .pipe(gulp.dest("."));
-});
-
-gulp.task("min", ["min:js", "min:css"]);
diff --git a/templates/projects/webbasic/package.json b/templates/projects/webbasic/package.json
deleted file mode 100755
index 16a66434..00000000
--- a/templates/projects/webbasic/package.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "name": "<%= namespace.toLowerCase() %>",
-  "version": "0.0.0",
-  "private": true,
-  "devDependencies": {<% if(!grunt){ %>
-    "gulp": "3.9.1",
-    "gulp-concat": "2.6.0",
-    "gulp-cssmin": "0.1.7",
-    "gulp-uglify": "1.5.3",
-    "rimraf": "2.5.2"<% } %><% if(grunt){ %>
-    "grunt": "1.0.1"<% } %>
-  }
-}
diff --git a/templates/projects/webbasic/project.json b/templates/projects/webbasic/project.json
index 28abc84f..2abce44c 100755
--- a/templates/projects/webbasic/project.json
+++ b/templates/projects/webbasic/project.json
@@ -18,10 +18,18 @@
     "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
     "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final"
   },
 
   "tools": {
+    "BundlerMinifier.Core": {
+      "version": "2.0.208",
+      "imports": [
+        "portable-net45+win8+dnxcore50",
+        "portable-net40+sl5+win8+wp8+wpa81"
+      ]
+    },
     "Microsoft.AspNetCore.Razor.Tools": {
       "version": "1.0.0-preview1-final",
       "imports": "portable-net45+win8+dnxcore50"
@@ -44,11 +52,18 @@
 
   "buildOptions": {
     "emitEntryPoint": true,
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+     "compile": {
+      "exclude": [
+        "node_modules"
+      ]
+    }
   },
 
   "runtimeOptions": {
-    "gcServer": true
+    "configProperties": {
+      "System.GC.Server": true
+    }
   },
 
   "publishOptions": {
@@ -61,7 +76,8 @@
   },
 
   "scripts": {
-    "prepublish": [ "npm install", "bower install"<% if(!grunt){ %>, "gulp clean", "gulp min"<% } %> ],
+    "precompile": [ "dotnet bundle" ],
+    "prepublish": [ "bower install" ],
     "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
   },
 
diff --git a/templates/projects/webbasic/wwwroot/css/site.css b/templates/projects/webbasic/wwwroot/css/site.css
index 4c983f70..7a68c46e 100755
--- a/templates/projects/webbasic/wwwroot/css/site.css
+++ b/templates/projects/webbasic/wwwroot/css/site.css
@@ -22,6 +22,13 @@ textarea {
     font-size: 20px;
     line-height: 1.4;
 }
+
+/* Make .svg files in the carousel display properly in older browsers */
+.carousel-inner .item img[src$=".svg"]
+{
+    width: 100%;
+}
+
 /* Hide/rearrange for smaller screens */
 @media screen and (max-width: 767px) {
   /* Hide captions */
diff --git a/templates/projects/webbasic/wwwroot/css/site.min.css b/templates/projects/webbasic/wwwroot/css/site.min.css
index af119157..8c1ea957 100644
--- a/templates/projects/webbasic/wwwroot/css/site.min.css
+++ b/templates/projects/webbasic/wwwroot/css/site.min.css
@@ -1 +1 @@
-body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}@media screen and (max-width:767px){.carousel-caption{display:none}}
+body{padding-top:50px;padding-bottom:20px}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.carousel-inner .item img[src$=".svg"]{width:100%}@media screen and (max-width:767px){.carousel-caption{display:none}}
diff --git a/test/test-core.js b/test/test-core.js
index b945541a..0eb3f1b8 100644
--- a/test/test-core.js
+++ b/test/test-core.js
@@ -129,52 +129,6 @@ describe('aspnet - Unit Test Application', function() {
 
 });
 
-/*
- * yo aspnet Web Application - Grunt option
- */
-describe('aspnet - Web Application w/grunt', function() {
-
-  util.goCreateApplicationWithOptions('web', 'gruntTest', 'bootstrap', {
-    grunt: 'grunt'
-  });
-
-  describe('Checking directories', function() {
-    it('Application directory created', function() {
-      assert.file('gruntTest/');
-    });
-
-    it('grunt file created', function() {
-      assert.file('gruntTest/Gruntfile.js');
-    });
-
-    it('gulpfile does NOT exist', function() {
-      assert.noFile('gruntTest/gulpfile.js');
-    });
-  });
-});
-
-/*
- * yo aspnet Web Application - No Grunt option
- */
-describe('aspnet - Web Application w/o grunt', function() {
-
-  util.goCreateApplication('web', 'gulpTest');
-
-  describe('Checking directories', function() {
-    it('Application directory created', function() {
-      assert.file('gulpTest/');
-    });
-
-    it('gulp file created', function() {
-      assert.file('gulpTest/gulpfile.js');
-    });
-
-    it('grunt file does NOT exist', function() {
-      assert.noFile('gulpTest/Gruntfile.js');
-    });
-  });
-});
-
 /*
  * yo aspnet Web Application (Bootstrap)
  */
@@ -256,9 +210,8 @@ describe('aspnet - Web Application (Bootstrap)', function() {
     'webTest/.gitignore',
     'webTest/appsettings.json',
     'webTest/bower.json',
+    'webTest/bundleconfig.json',
     'webTest/Dockerfile',
-    'webTest/gulpfile.js',
-    'webTest/package.json',
     'webTest/Program.cs',
     'webTest/project.json',
     'webTest/README.md',
@@ -424,9 +377,8 @@ describe('aspnet - Web Application (Semantic UI)', function() {
     'webTest/.gitignore',
     'webTest/appsettings.json',
     'webTest/bower.json',
+    'webTest/bundleconfig.json',
     'webTest/Dockerfile',
-    'webTest/gulpfile.js',
-    'webTest/package.json',
     'webTest/Program.cs',
     'webTest/project.json',
     'webTest/README.md',
@@ -555,53 +507,6 @@ describe('aspnet - Web Application (Semantic UI)', function() {
 
 });
 
-
-/*
- * yo aspnet Web Application Basic - Grunt option
- */
-describe('aspnet - Web Application Basic w/grunt', function() {
-
-  util.goCreateApplicationWithOptions('webbasic', 'gruntTest', 'bootstrap', {
-    grunt: 'grunt'
-  });
-
-  describe('Checking directories', function() {
-    it('Application directory created', function() {
-      assert.file('gruntTest/');
-    });
-
-    it('grunt file created', function() {
-      assert.file('gruntTest/Gruntfile.js');
-    });
-
-    it('gulpfile does NOT exist', function() {
-      assert.noFile('gruntTest/gulpfile.js');
-    });
-  });
-});
-
-/*
- * yo aspnet Web Application Basic - No Grunt option
- */
-describe('aspnet - Web Application Basic w/o grunt', function() {
-
-  util.goCreateApplication('webbasic', 'gulpTest');
-
-  describe('Checking directories', function() {
-    it('Application directory created', function() {
-      assert.file('gulpTest/');
-    });
-
-    it('gulp file created', function() {
-      assert.file('gulpTest/gulpfile.js');
-    });
-
-    it('grunt file does NOT exist', function() {
-      assert.noFile('gulpTest/Gruntfile.js');
-    });
-  });
-});
-
 /*
  * yo aspnet Web Application (Bootstrap)
  */
@@ -658,10 +563,9 @@ describe('aspnet - Web Application Basic (Bootstrap)', function() {
     'webTest/.bowerrc',
     'webTest/.gitignore',
     'webTest/bower.json',
+    'webTest/bundleconfig.json',
     'webTest/appsettings.json',
     'webTest/Controllers/HomeController.cs',
-    'webTest/gulpfile.js',
-    'webTest/package.json',
     'webTest/Program.cs',
     'webTest/project.json',
     'webTest/Properties/launchSettings.json',
@@ -759,8 +663,6 @@ describe('aspnet - Web Application Basic (Semantic UI)', function() {
     'webTest/bower.json',
     'webTest/appsettings.json',
     'webTest/Controllers/HomeController.cs',
-    'webTest/gulpfile.js',
-    'webTest/package.json',
     'webTest/Program.cs',
     'webTest/project.json',
     'webTest/Properties/launchSettings.json',