diff --git a/samples/StandaloneApp/Pages/Counter.cshtml b/samples/StandaloneApp/Pages/Counter.cshtml
index a90b296a50..bf8e96e921 100644
--- a/samples/StandaloneApp/Pages/Counter.cshtml
+++ b/samples/StandaloneApp/Pages/Counter.cshtml
@@ -1,5 +1,6 @@
 @page "/counter"
 @using Microsoft.AspNetCore.Blazor
+
 <h1>Counter</h1>
 
 <p>Current count: @currentCount</p>
diff --git a/samples/StandaloneApp/Pages/Index.cshtml b/samples/StandaloneApp/Pages/Index.cshtml
index 86eb281395..16dac31925 100644
--- a/samples/StandaloneApp/Pages/Index.cshtml
+++ b/samples/StandaloneApp/Pages/Index.cshtml
@@ -1,4 +1,5 @@
 @page "/"
+
 <h1>Hello, world!</h1>
 
 Welcome to your new app.
diff --git a/samples/StandaloneApp/Shared/MainLayout.cshtml b/samples/StandaloneApp/Shared/MainLayout.cshtml
index fedd543b5c..614e0c08ac 100644
--- a/samples/StandaloneApp/Shared/MainLayout.cshtml
+++ b/samples/StandaloneApp/Shared/MainLayout.cshtml
@@ -1,11 +1,11 @@
 @implements ILayoutComponent
 
-<div class='container-fluid'>
-    <div class='row'>
-        <div class='col-sm-3'>
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-3">
             <NavMenu />
         </div>
-        <div class='col-sm-9'>
+        <div class="col-sm-9">
             @Body
         </div>
     </div>
diff --git a/samples/StandaloneApp/Shared/NavMenu.cshtml b/samples/StandaloneApp/Shared/NavMenu.cshtml
index cfd37a55a2..ffdbde8432 100644
--- a/samples/StandaloneApp/Shared/NavMenu.cshtml
+++ b/samples/StandaloneApp/Shared/NavMenu.cshtml
@@ -1,30 +1,30 @@
-<div class='main-nav'>
-    <div class='navbar navbar-inverse'>
-        <div class='navbar-header'>
-            <button type='button' class='navbar-toggle' data-toggle='collapse' data-target='.navbar-collapse'>
-                <span class='sr-only'>Toggle navigation</span>
-                <span class='icon-bar'></span>
-                <span class='icon-bar'></span>
-                <span class='icon-bar'></span>
+<div class="main-nav">
+    <div class="navbar navbar-inverse">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
             </button>
-            <a class='navbar-brand' href='/'>Blazor app</a>
+            <a class="navbar-brand" href="/">Blazor app</a>
         </div>
-        <div class='clearfix'></div>
-        <div class='navbar-collapse collapse'>
-            <ul class='nav navbar-nav'>
+        <div class="clearfix"></div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
                 <li>
                     <NavLink href="/" Match=NavLinkMatch.All>
-                        <span class='glyphicon glyphicon-home'></span> Home
+                        <span class="glyphicon glyphicon-home"></span> Home
                     </NavLink>
                 </li>
                 <li>
                     <NavLink href="/counter">
-                        <span class='glyphicon glyphicon-education'></span> Counter
+                        <span class="glyphicon glyphicon-education"></span> Counter
                     </NavLink>
                 </li>
                 <li>
                     <NavLink href="/fetchdata">
-                        <span class='glyphicon glyphicon-th-list'></span> Fetch data
+                        <span class="glyphicon glyphicon-th-list"></span> Fetch data
                     </NavLink>
                 </li>
             </ul>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml
index 3677204440..05b0c1b07b 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/Counter.cshtml
@@ -1,4 +1,5 @@
 @page "/counter"
+
 <h1>Counter</h1>
 
 <p>Current count: @currentCount</p>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml
index 3e93b74450..8f3dc8adf4 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Pages/FetchData.cshtml
@@ -12,7 +12,7 @@
 }
 else
 {
-    <table class='table'>
+    <table class="table">
         <thead>
             <tr>
                 <th>Date</th>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/MainLayout.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/MainLayout.cshtml
index 0cdc627c03..84b121a2b0 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/MainLayout.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/MainLayout.cshtml
@@ -1,11 +1,11 @@
 @implements ILayoutComponent
 
-<div class='container-fluid'>
-    <div class='row'>
-        <div class='col-sm-3'>
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-sm-3">
             <NavMenu />
         </div>
-        <div class='col-sm-9'>
+        <div class="col-sm-9">
             @Body
         </div>
     </div>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/NavMenu.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/NavMenu.cshtml
index 54d4a08503..b7369ff5bb 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/NavMenu.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorHosted.CSharp/BlazorHosted.CSharp.Client/Shared/NavMenu.cshtml
@@ -1,30 +1,30 @@
-<div class='main-nav'>
-    <div class='navbar navbar-inverse'>
-        <div class='navbar-header'>
-            <button type='button' class='navbar-toggle' data-toggle='collapse' data-target='.navbar-collapse'>
-                <span class='sr-only'>Toggle navigation</span>
-                <span class='icon-bar'></span>
-                <span class='icon-bar'></span>
-                <span class='icon-bar'></span>
+<div class="main-nav">
+    <div class="navbar navbar-inverse">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
             </button>
-            <a class='navbar-brand' href='/'>BlazorHosted.CSharp</a>
+            <a class="navbar-brand" href="/">BlazorHosted.CSharp</a>
         </div>
-        <div class='clearfix'></div>
-        <div class='navbar-collapse collapse'>
-            <ul class='nav navbar-nav'>
+        <div class="clearfix"></div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
                 <li>
                     <NavLink href="/" Match=NavLinkMatch.All>
-                        <span class='glyphicon glyphicon-home'></span> Home
+                        <span class="glyphicon glyphicon-home"></span> Home
                     </NavLink>
                 </li>
                 <li>
                     <NavLink href="/counter">
-                        <span class='glyphicon glyphicon-education'></span> Counter
+                        <span class="glyphicon glyphicon-education"></span> Counter
                     </NavLink>
                 </li>
                 <li>
                     <NavLink href="/fetchdata">
-                        <span class='glyphicon glyphicon-th-list'></span> Fetch data
+                        <span class="glyphicon glyphicon-th-list"></span> Fetch data
                     </NavLink>
                 </li>
             </ul>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml
index 3677204440..05b0c1b07b 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/Counter.cshtml
@@ -1,4 +1,5 @@
 @page "/counter"
+
 <h1>Counter</h1>
 
 <p>Current count: @currentCount</p>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml
index 4c87bda9f6..f9dd3f7cb1 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Pages/FetchData.cshtml
@@ -11,7 +11,7 @@
 }
 else
 {
-    <table class='table'>
+    <table class="table">
         <thead>
             <tr>
                 <th>Date</th>
diff --git a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/NavMenu.cshtml b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/NavMenu.cshtml
index b7b3618c39..05bc7a0c6e 100644
--- a/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/NavMenu.cshtml
+++ b/src/Microsoft.AspNetCore.Blazor.Templates/content/BlazorStandalone.CSharp/Shared/NavMenu.cshtml
@@ -1,30 +1,30 @@
-<div class='main-nav'>
-    <div class='navbar navbar-inverse'>
-        <div class='navbar-header'>
-            <button type='button' class='navbar-toggle' data-toggle='collapse' data-target='.navbar-collapse'>
-                <span class='sr-only'>Toggle navigation</span>
-                <span class='icon-bar'></span>
-                <span class='icon-bar'></span>
-                <span class='icon-bar'></span>
+<div class="main-nav">
+    <div class="navbar navbar-inverse">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
             </button>
-            <a class='navbar-brand' href='/'>BlazorStandalone.CSharp</a>
+            <a class="navbar-brand" href="/">BlazorStandalone.CSharp</a>
         </div>
-        <div class='clearfix'></div>
-        <div class='navbar-collapse collapse'>
-            <ul class='nav navbar-nav'>
+        <div class="clearfix"></div>
+        <div class="navbar-collapse collapse">
+            <ul class="nav navbar-nav">
                 <li>
                     <NavLink href="/" Match=NavLinkMatch.All>
-                        <span class='glyphicon glyphicon-home'></span> Home
+                        <span class="glyphicon glyphicon-home"></span> Home
                     </NavLink>
                 </li>
                 <li>
                     <NavLink href="/counter">
-                        <span class='glyphicon glyphicon-education'></span> Counter
+                        <span class="glyphicon glyphicon-education"></span> Counter
                     </NavLink>
                 </li>
                 <li>
                     <NavLink href="/fetchdata">
-                        <span class='glyphicon glyphicon-th-list'></span> Fetch data
+                        <span class="glyphicon glyphicon-th-list"></span> Fetch data
                     </NavLink>
                 </li>
             </ul>