diff --git a/systemvm/agent/ui/viewer.ftl b/systemvm/agent/ui/viewer.ftl
index e6b12071111e..fef0d7e0b68e 100644
--- a/systemvm/agent/ui/viewer.ftl
+++ b/systemvm/agent/ui/viewer.ftl
@@ -18,10 +18,10 @@ under the License.
 -->
 <html>
 <head>
-<script type="text/javascript" language="javascript" src="/resource/js/jquery.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/ajaxviewer.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/ajaxkeys.js"></script>
-<script type="text/javascript" language="javascript" src="/resource/js/handler.js"></script>
+<script src="/resource/js/jquery.js"></script>
+<script src="/resource/js/ajaxviewer.js"></script>
+<script src="/resource/js/ajaxkeys.js"></script>
+<script src="/resource/js/handler.js"></script>
 <link rel="stylesheet" type="text/css" href="/resource/css/ajaxviewer.css"></link>
 <title>${title}</title>
 </head>
@@ -44,7 +44,7 @@ under the License.
 
 <div id="main_panel" tabindex="1"></div>
 
-<script language="javascript">
+<script>
 
 var tileMap = [ ${tileSequence} ];
 var ajaxViewer = new AjaxViewer('main_panel', '${imgUrl}', '${updateUrl}', tileMap,
diff --git a/tools/apidoc/generatecommands.xsl b/tools/apidoc/generatecommands.xsl
index 6e036e07077c..ce8dc0eb8baf 100644
--- a/tools/apidoc/generatecommands.xsl
+++ b/tools/apidoc/generatecommands.xsl
@@ -141,7 +141,7 @@ version="1.0">
         </div><!-- #BeginLibraryItem "/libraries/footer.lbi" -->
 <div id="footer">
 <div id="comments_thread">
-    <script type="text/javascript" src="https://comments.apache.org/show_comments.lua?site=test" async="true">
+    <script src="https://comments.apache.org/show_comments.lua?site=test" async="true">
     </script>
     <noscript>
     <iframe width="930" height="500" src="https://comments.apache.org/iframe.lua?site=test&amp;page=4.2.0/rootadmin"></iframe>
diff --git a/tools/ngui/templates/index.html b/tools/ngui/templates/index.html
index 1dab6555d653..661a8f439990 100644
--- a/tools/ngui/templates/index.html
+++ b/tools/ngui/templates/index.html
@@ -1,19 +1,23 @@
-#Licensed to the Apache Software Foundation (ASF) under one
-#or more contributor license agreements.  See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership.  The ASF licenses this file
-#to you under the Apache License, Version 2.0 (the
-#"License"); you may not use this file except in compliance
-#with the License.  You may obtain a copy of the License at
-#http://www.apache.org/licenses/LICENSE-2.0
-#Unless required by applicable law or agreed to in writing,
-#software distributed under the License is distributed on an
-#"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#KIND, either express or implied.  See the License for the
-#specific language governing permissions and limitations
-#under the License.
+<!--
+     Licensed to the Apache Software Foundation (ASF) under one
+     or more contributor license agreements.  See the NOTICE file
+     distributed with this work for additional information
+     regarding copyright ownership.  The ASF licenses this file
+     to you under the Apache License, Version 2.0 (the
+     "License"); you may not use this file except in compliance
+     with the License.  You may obtain a copy of the License at
 
-<!DOCTYPE html>
+     http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing,
+     software distributed under the License is distributed on an
+     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+     KIND, either express or implied.  See the License for the
+     specific language governing permissions and limitations
+     under the License.
+-->
+
+<!doctype html>
 <html lang="en" ng-app="cloudstack">
 <head>
     <meta charset="utf-8">
@@ -102,41 +106,41 @@ <h3>CloudStack UI using Angular.js and Twitter Bootstrap</h3>
         </table>
     </script>
 
-    <script type="text/javascript" src="static/js/lib/jquery-1.7.2.js"></script>
-    <script type="text/javascript" src="static/js/lib/angular.js"></script>
-    <script type="text/javascript" src="static/js/app/app.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/virtualmachines.js"></script>
-    <script type="text/javascript" src="static/js/app/instances/instances.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/volumes.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/snapshots.js"></script>
-    <script type="text/javascript" src="static/js/app/storage/storage.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/networks.js"></script>
-    <script type="text/javascript" src="static/js/app/networks/networks.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/templates.js"></script>
-    <script type="text/javascript" src="static/js/app/templates/templates.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/events.js"></script>
-    <script type="text/javascript" src="static/js/app/events/events.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/accounts.js"></script>
-    <script type="text/javascript" src="static/js/app/accounts/accounts.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/domains.js"></script>
-    <script type="text/javascript" src="static/js/app/domains/domains.js"></script>
-    <script type="text/javascript" src="static/js/app/globalsettings/globalsettings.js"></script>
-    <script type="text/javascript" src="static/js/app/serviceofferings/serviceofferings.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/serviceofferings.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/projects.js"></script>
-    <script type="text/javascript" src="static/js/app/projects/projects.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/configurations.js"></script>
-    <script type="text/javascript" src="static/js/common/services/breadcrumbs.js"></script>
-    <script type="text/javascript" src="static/js/common/services/helperfunctions.js"></script>
-    <script type="text/javascript" src="static/js/common/services/requester.js"></script>
-    <script type="text/javascript" src="static/js/common/services/notifications.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/confirm.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/modal-form.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/label.js"></script>
-    <script type="text/javascript" src="static/js/common/directives/edit-in-place.js"></script>
-    <script type="text/javascript" src="static/js/common/dictionary.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/zones.js"></script>
-    <script type="text/javascript" src="static/js/common/resources/diskofferings.js"></script>
-    <script type="text/javascript" src="static/js/lib/angular-ui.min.js"></script>
+    <script src="static/js/lib/jquery-1.7.2.js"></script>
+    <script src="static/js/lib/angular.js"></script>
+    <script src="static/js/app/app.js"></script>
+    <script src="static/js/common/resources/virtualmachines.js"></script>
+    <script src="static/js/app/instances/instances.js"></script>
+    <script src="static/js/common/resources/volumes.js"></script>
+    <script src="static/js/common/resources/snapshots.js"></script>
+    <script src="static/js/app/storage/storage.js"></script>
+    <script src="static/js/common/resources/networks.js"></script>
+    <script src="static/js/app/networks/networks.js"></script>
+    <script src="static/js/common/resources/templates.js"></script>
+    <script src="static/js/app/templates/templates.js"></script>
+    <script src="static/js/common/resources/events.js"></script>
+    <script src="static/js/app/events/events.js"></script>
+    <script src="static/js/common/resources/accounts.js"></script>
+    <script src="static/js/app/accounts/accounts.js"></script>
+    <script src="static/js/common/resources/domains.js"></script>
+    <script src="static/js/app/domains/domains.js"></script>
+    <script src="static/js/app/globalsettings/globalsettings.js"></script>
+    <script src="static/js/app/serviceofferings/serviceofferings.js"></script>
+    <script src="static/js/common/resources/serviceofferings.js"></script>
+    <script src="static/js/common/resources/projects.js"></script>
+    <script src="static/js/app/projects/projects.js"></script>
+    <script src="static/js/common/resources/configurations.js"></script>
+    <script src="static/js/common/services/breadcrumbs.js"></script>
+    <script src="static/js/common/services/helperfunctions.js"></script>
+    <script src="static/js/common/services/requester.js"></script>
+    <script src="static/js/common/services/notifications.js"></script>
+    <script src="static/js/common/directives/confirm.js"></script>
+    <script src="static/js/common/directives/modal-form.js"></script>
+    <script src="static/js/common/directives/label.js"></script>
+    <script src="static/js/common/directives/edit-in-place.js"></script>
+    <script src="static/js/common/dictionary.js"></script>
+    <script src="static/js/common/resources/zones.js"></script>
+    <script src="static/js/common/resources/diskofferings.js"></script>
+    <script src="static/js/lib/angular-ui.min.js"></script>
 </body>
 </html>
diff --git a/ui/public/example.html b/ui/public/example.html
index df59d49086d3..2992eae80c79 100644
--- a/ui/public/example.html
+++ b/ui/public/example.html
@@ -16,7 +16,7 @@
      specific language governing permissions and limitations
      under the License.
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-gb">
   <head>
     <meta charset="utf-8">
diff --git a/ui/public/index.html b/ui/public/index.html
index 7397f27d545e..0f0bfe59397b 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -16,7 +16,7 @@
      specific language governing permissions and limitations
      under the License.
 -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en-gb">
   <head>
     <meta charset="utf-8">
