diff --git a/packages/cli/test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png b/packages/cli/test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png
index b79ccb3291..9e80424d5d 100644
Binary files a/packages/cli/test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png and b/packages/cli/test/functional/test_site/expected/9c9e77fc0a983cb6b592e65733787bec.png differ
diff --git a/packages/cli/test/functional/test_site/expected/bugs/index.html b/packages/cli/test/functional/test_site/expected/bugs/index.html
index f5c6ac27e5..6c733a809b 100644
--- a/packages/cli/test/functional/test_site/expected/bugs/index.html
+++ b/packages/cli/test/functional/test_site/expected/bugs/index.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/index.html b/packages/cli/test/functional/test_site/expected/index.html
index cc76c41d94..30b06f134d 100644
--- a/packages/cli/test/functional/test_site/expected/index.html
+++ b/packages/cli/test/functional/test_site/expected/index.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/sub_site/index.html b/packages/cli/test/functional/test_site/expected/sub_site/index.html
index 2b6ee180e7..9af6dd5830 100644
--- a/packages/cli/test/functional/test_site/expected/sub_site/index.html
+++ b/packages/cli/test/functional/test_site/expected/sub_site/index.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html
index ca458cbe2e..4b6b0fcb1a 100644
--- a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html
+++ b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/index.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html
index 9c4ad8dccb..ce025b78ec 100644
--- a/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html
+++ b/packages/cli/test/functional/test_site/expected/sub_site/nested_sub_site/testNunjucksPathResolving.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html b/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html
index e6de156bbd..962855d00e 100644
--- a/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html
+++ b/packages/cli/test/functional/test_site/expected/sub_site/testNunjucksPathResolving.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html b/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html
index f5707e0ef4..0c74521ec4 100644
--- a/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html
+++ b/packages/cli/test/functional/test_site/expected/testAnchorGeneration.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html b/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html
index 9c48ed9251..7719b43b4a 100644
--- a/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html
+++ b/packages/cli/test/functional/test_site/expected/testAntiFOUCStyles.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testCodeBlocks.html b/packages/cli/test/functional/test_site/expected/testCodeBlocks.html
index 9c91954bb9..ded908907e 100644
--- a/packages/cli/test/functional/test_site/expected/testCodeBlocks.html
+++ b/packages/cli/test/functional/test_site/expected/testCodeBlocks.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testDates.html b/packages/cli/test/functional/test_site/expected/testDates.html
index bc13298bf3..4626f6f7a5 100644
--- a/packages/cli/test/functional/test_site/expected/testDates.html
+++ b/packages/cli/test/functional/test_site/expected/testDates.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html b/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html
index 346ee71823..2157d1e68e 100644
--- a/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html
+++ b/packages/cli/test/functional/test_site/expected/testEmptyFrontmatter.html
@@ -4,10 +4,10 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop2.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -31,10 +31,10 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom2.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testExternalScripts.html b/packages/cli/test/functional/test_site/expected/testExternalScripts.html
index 8bcbc9255d..0ce272e5b1 100644
--- a/packages/cli/test/functional/test_site/expected/testExternalScripts.html
+++ b/packages/cli/test/functional/test_site/expected/testExternalScripts.html
@@ -4,10 +4,10 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop2.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -31,10 +31,10 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom2.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html b/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html
index 76b7ba404c..1f26d20413 100644
--- a/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html
+++ b/packages/cli/test/functional/test_site/expected/testIncludeBoilerplate.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html b/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html
index c56b6531cd..7321323ad5 100644
--- a/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html
+++ b/packages/cli/test/functional/test_site/expected/testIncludeMultipleModals.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html b/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html
index 9d95118a0a..c960dbeac8 100644
--- a/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html
+++ b/packages/cli/test/functional/test_site/expected/testIncludePluginsRendered.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testLayouts.html b/packages/cli/test/functional/test_site/expected/testLayouts.html
index 1786591eed..5657c4b038 100644
--- a/packages/cli/test/functional/test_site/expected/testLayouts.html
+++ b/packages/cli/test/functional/test_site/expected/testLayouts.html
@@ -4,10 +4,10 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop2.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -31,10 +31,10 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom2.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html b/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html
index 0875329ad3..4157405cc6 100644
--- a/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html
+++ b/packages/cli/test/functional/test_site/expected/testLayoutsOverride.html
@@ -4,10 +4,10 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptTop2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop2.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -31,10 +31,10 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
 
 
-  <script src="/test_site/headFiles/customScriptBottom2.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom2.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html b/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html
index 6e9f2cd188..a0f1b09659 100644
--- a/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html
+++ b/packages/cli/test/functional/test_site/expected/testNunjucksPathResolving.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html b/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html
index 0d207d0066..e9576d1bb6 100644
--- a/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html
+++ b/packages/cli/test/functional/test_site/expected/testPanelMarkdownParsing.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testPlantUML.html b/packages/cli/test/functional/test_site/expected/testPlantUML.html
index 86fcdefece..c9a3af4107 100644
--- a/packages/cli/test/functional/test_site/expected/testPlantUML.html
+++ b/packages/cli/test/functional/test_site/expected/testPlantUML.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html b/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html
index 4ed908afb6..50cfaf9f08 100644
--- a/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html
+++ b/packages/cli/test/functional/test_site/expected/testPopoverTrigger.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testThumbnails.html b/packages/cli/test/functional/test_site/expected/testThumbnails.html
index cd0f6d76a7..39cf041b76 100644
--- a/packages/cli/test/functional/test_site/expected/testThumbnails.html
+++ b/packages/cli/test/functional/test_site/expected/testThumbnails.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html b/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html
index 833089bacb..84777a5c85 100644
--- a/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html
+++ b/packages/cli/test/functional/test_site/expected/testTooltipSpacing.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html b/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html
index 47785480a3..5df7914849 100644
--- a/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html
+++ b/packages/cli/test/functional/test_site/expected/testVariableContainsInclude.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site/expected/test_md_fragment.html b/packages/cli/test/functional/test_site/expected/test_md_fragment.html
index 9c312bb548..95e743cb80 100644
--- a/packages/cli/test/functional/test_site/expected/test_md_fragment.html
+++ b/packages/cli/test/functional/test_site/expected/test_md_fragment.html
@@ -4,7 +4,7 @@
 <head>
 
   <meta name="default-head-top">
-  <script src="/test_site/headFiles/customScriptTop.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptTop.js"></script>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -28,7 +28,7 @@
 
   <meta name="default-head-bottom">
   <link rel="stylesheet" href="/test_site/stylesheets/styles.css">
-  <script src="/test_site/headFiles/customScriptBottom.js" type="application/javascript"></script>
+  <script src="/test_site/headFiles/customScriptBottom.js"></script>
   <link rel="icon" href="/test_site/favicon.png">
 </head>
 <script>
diff --git a/packages/cli/test/functional/test_site_special_tags/expected/index.html b/packages/cli/test/functional/test_site_special_tags/expected/index.html
index 320e8b2fe3..4fe6a88025 100644
--- a/packages/cli/test/functional/test_site_special_tags/expected/index.html
+++ b/packages/cli/test/functional/test_site_special_tags/expected/index.html
@@ -32,21 +32,10 @@ <h1 id="functional-test-for-htmlparser2-and-markdown-it-patches-for-special-tags
     <h2 id="so-far-as-to-comply-with-the-commonmark-spec"><span id="so-far-as-to-comply-with-the-commonmark-spec" class="anchor"></span>So far as to comply with the commonmark spec<a class="fa fa-anchor" href="#so-far-as-to-comply-with-the-commonmark-spec" onclick="event.stopPropagation()"></a></h2>
     <p>There should be no text between this and the next <code class="hljs inline no-lang" v-pre>&lt;hr&gt;</code> tag in the browser, since it is a <code class="hljs inline no-lang" v-pre>&lt;script&gt;</code> tag.<br>
       There should be an alert with the value of 2 as well.</p>
-    <script type="application/javascript">
-let x = 1;
 
-x += 1;
-alert(x);
-</script>
     <hr>
     <p>There should be no text between this and the next <code class="hljs inline no-lang" v-pre>&lt;hr&gt;</code> tag in the browser, since it is a <code class="hljs inline no-lang" v-pre>&lt;style&gt;</code> tag.</p>
-    <script src defer type="application/javascript" style-bypass-vue-compilation>
-
-.bigger-text {
-  font-size: 10em;
-}
 
-</script>
     <hr>
     <p>There should be text between this and the next <code class="hljs inline no-lang" v-pre>&lt;hr&gt;</code> tag, since it is a special tag.
       All text should appear in the browser window as a single line,
@@ -102,6 +91,17 @@ <h2 id="so-far-as-to-comply-with-the-commonmark-spec"><span id="so-far-as-to-com
     <i class="fa fa-arrow-circle-up fa-lg d-print-none" id="scroll-top-button" onclick="handleScrollTop()" aria-hidden="true"></i></p>
   </div>
 </body>
+<script>
+let x = 1;
+
+x += 1;
+alert(x);
+</script>
+<style>
+  .bigger-text {
+    font-size: 10em;
+  }
+</style>
 <script src="markbind/js/bootstrap-utility.min.js"></script>
 <script>
   MarkBind.setupWithSearch()
diff --git a/packages/cli/test/functional/test_site_special_tags/expected/index.page-vue-render.js b/packages/cli/test/functional/test_site_special_tags/expected/index.page-vue-render.js
index 2b127775b1..f072b0d492 100644
--- a/packages/cli/test/functional/test_site_special_tags/expected/index.page-vue-render.js
+++ b/packages/cli/test/functional/test_site_special_tags/expected/index.page-vue-render.js
@@ -1,7 +1,7 @@
 
     var pageVueRenderFn = function anonymous(
 ) {
-with(this){return _c('div',{attrs:{"id":"app"}},[_c('p'),_m(0),_v(" "),_m(1),_v(" "),_m(2),_v(" "),_c('script',{attrs:{"type":"application/javascript"}},[_v("\nlet x = 1;\n\nx += 1;\nalert(x);\n")]),_v(" "),_c('hr'),_v(" "),_m(3),_v(" "),_c('script',{attrs:{"src":"","defer":"","type":"application/javascript","style-bypass-vue-compilation":""}},[_v("\n\n.bigger-text {\n  font-size: 10em;\n}\n\n")]),_v(" "),_c('hr'),_v(" "),_m(4),_v(" "),_c('testtag',[_c('these',[_v("\nsome text\n")]),_v(" "),_c('p',[_v("//")]),_v(" "),_c('p',[_v("/*\n...\n*/")])],1),_v(" "),_c('hr'),_v(" "),_m(5),_v(" "),_c('abc',[_c('these',[_v("\nsome text\n")]),_v(" "),_c('p',[_v("//")]),_v(" "),_c('p',[_v("/*\n...\n*/")])],1),_v(" "),_c('hr'),_v(" "),_m(6),_v(" "),_c('testselfclosingtag'),_v(" "),_c('testselfclosingtag'),_v(" "),_c('testselfclosingtag',[_c('p',[_v("Lorem ipsum lorem ipsum")])]),_v(" "),_c('hr'),_v(" "),_m(7),_v(" "),_c('div',[_c('testtag',[_v("\nlet x = 2;\n"),_c('p',[_v("if (x <= 5) {\nalert(x);\n}")])])],1),_v(" "),_c('hr'),_v(" "),_c('i',{staticClass:"fa fa-arrow-circle-up fa-lg d-print-none",attrs:{"id":"scroll-top-button","onclick":"handleScrollTop()","aria-hidden":"true"}}),_c('p')],1)}
+with(this){return _c('div',{attrs:{"id":"app"}},[_c('p'),_m(0),_v(" "),_m(1),_v(" "),_m(2),_v(" "),_c('hr'),_v(" "),_m(3),_v(" "),_c('hr'),_v(" "),_m(4),_v(" "),_c('testtag',[_c('these',[_v("\nsome text\n")]),_v(" "),_c('p',[_v("//")]),_v(" "),_c('p',[_v("/*\n...\n*/")])],1),_v(" "),_c('hr'),_v(" "),_m(5),_v(" "),_c('abc',[_c('these',[_v("\nsome text\n")]),_v(" "),_c('p',[_v("//")]),_v(" "),_c('p',[_v("/*\n...\n*/")])],1),_v(" "),_c('hr'),_v(" "),_m(6),_v(" "),_c('testselfclosingtag'),_v(" "),_c('testselfclosingtag'),_v(" "),_c('testselfclosingtag',[_c('p',[_v("Lorem ipsum lorem ipsum")])]),_v(" "),_c('hr'),_v(" "),_m(7),_v(" "),_c('div',[_c('testtag',[_v("\nlet x = 2;\n"),_c('p',[_v("if (x <= 5) {\nalert(x);\n}")])])],1),_v(" "),_c('hr'),_v(" "),_c('i',{staticClass:"fa fa-arrow-circle-up fa-lg d-print-none",attrs:{"id":"scroll-top-button","onclick":"handleScrollTop()","aria-hidden":"true"}}),_c('p')],1)}
 };
     var pageVueStaticRenderFns = [function anonymous(
 ) {
diff --git a/packages/core/src/External/External.js b/packages/core/src/External/External.js
index d3637cea32..a9926242cf 100644
--- a/packages/core/src/External/External.js
+++ b/packages/core/src/External/External.js
@@ -46,7 +46,8 @@ class External {
 
     const pageSources = new PageSources();
     const docId = `ext-${fsUtil.removeExtension(path.basename(asIfAtFilePath))}`;
-    const nodeProcessor = new NodeProcessor(fileConfig, pageSources, variableProcessor, pluginManager, docId);
+    const nodeProcessor = new NodeProcessor(fileConfig, pageSources, variableProcessor,
+                                            pluginManager, undefined, docId);
 
     const nunjucksProcessed = variableProcessor.renderWithSiteVariables(this.sourceFilePath, pageSources);
     const mdHtmlProcessed = await nodeProcessor.process(this.sourceFilePath, nunjucksProcessed,
diff --git a/packages/core/src/Layout/Layout.js b/packages/core/src/Layout/Layout.js
index 1946860ce7..d408f25d4b 100644
--- a/packages/core/src/Layout/Layout.js
+++ b/packages/core/src/Layout/Layout.js
@@ -21,6 +21,7 @@ class Layout {
     this.headTop = [];
     this.headBottom = [];
     this.scriptBottom = [];
+    this.layoutUserScriptsAndStyles = [];
 
     this.generatePromise = undefined;
   }
@@ -53,7 +54,8 @@ class Layout {
 
       const nunjucksProcessed = variableProcessor.renderWithSiteVariables(
         this.sourceFilePath, pageSources, layoutVariables);
-      nodeProcessor = new NodeProcessor(fileConfig, pageSources, variableProcessor, pluginManager, 'layout');
+      nodeProcessor = new NodeProcessor(fileConfig, pageSources, variableProcessor,
+                                        pluginManager, this.layoutUserScriptsAndStyles, 'layout');
       // eslint-disable-next-line no-await-in-loop
       this.layoutProcessed = await nodeProcessor.process(this.sourceFilePath, nunjucksProcessed,
                                                          this.sourceFilePath, layoutVariables);
@@ -100,6 +102,7 @@ class Layout {
       headTop: this.headTop,
       headBottom: this.headBottom,
       scriptBottom: this.scriptBottom,
+      layoutUserScriptsAndStyles: this.layoutUserScriptsAndStyles,
     };
   }
 }
diff --git a/packages/core/src/Page/PageVueServerRenderer.js b/packages/core/src/Page/PageVueServerRenderer.js
index 412b41a6d1..a198d47e71 100644
--- a/packages/core/src/Page/PageVueServerRenderer.js
+++ b/packages/core/src/Page/PageVueServerRenderer.js
@@ -9,13 +9,6 @@ let bundle = require('@markbind/core-web/dist/js/vueCommonAppFactory.min');
 
 const logger = require('../utils/logger');
 
-const vueRenderEscapeChars = {
-  '&lt;': '<',
-  '&gt;': '>',
-  '&quot;': '"',
-  '&amp;': '&',
-};
-
 const pageEntries = {}; // hold the mapping of sourcePath to latest built pages (for hot-reload dev purposes)
 
 /**
@@ -76,20 +69,7 @@ async function renderVuePage(compiledVuePage) {
     ...appFactory(),
   });
 
-  let renderedContent = await renderToString(VueAppPage);
-
-  /*
-   * https://github.com/vuejs/vue/blob/dev/packages/vue-server-renderer/basic.js
-   *
-   * vue-server-renderer automatically escapes various characters during rendering for security reasons.
-   * We un-escape these characters as there shouldn't be any security concerns in our use-case.
-   *
-   * We only un-escape & and " for now so that the script redirect for userGuide/devGuide will work.
-   * Un-escaping < and/or > will lead to hydration issues so we do not do it for now.
-   */
-  renderedContent = renderedContent.replace(/&(quot|amp);/g, match => vueRenderEscapeChars[match]);
-
-  return renderedContent;
+  return renderToString(VueAppPage);
 }
 
 /**
diff --git a/packages/core/src/Page/index.js b/packages/core/src/Page/index.js
index da942f3acb..d17ffb496e 100644
--- a/packages/core/src/Page/index.js
+++ b/packages/core/src/Page/index.js
@@ -56,6 +56,11 @@ class Page {
      * @type {Object<string, string | Array<string>>}
      */
     this.asset = _.cloneDeep(this.pageConfig.asset);
+    /**
+     * To collect all the user provided scripts and/or style content.
+     * @type {Array}
+     */
+    this.pageUserScriptsAndStyles = [];
     /**
      * The pure frontMatter of the page as collected in {@link collectFrontMatter}.
      * https://markbind.org/userGuide/tweakingThePageStructure.html#front-matter
@@ -131,6 +136,8 @@ class Page {
       asset,
       baseUrl: this.pageConfig.baseUrl,
       content,
+      pageUserScriptsAndStyles: this.pageUserScriptsAndStyles.join('\n'),
+      layoutUserScriptsAndStyles: this.asset.layoutUserScriptsAndStyles.join('\n'),
       hasPageNav,
       dev: this.pageConfig.dev,
       faviconUrl: this.pageConfig.faviconUrl,
@@ -456,7 +463,8 @@ class Page {
     const { variableProcessor, layoutManager, pluginManager } = this.pageConfig;
 
     const pageSources = new PageSources();
-    const nodeProcessor = new NodeProcessor(fileConfig, pageSources, variableProcessor, pluginManager);
+    const nodeProcessor = new NodeProcessor(fileConfig, pageSources, variableProcessor,
+                                            pluginManager, this.pageUserScriptsAndStyles);
 
     let content = variableProcessor.renderWithSiteVariables(this.pageConfig.sourcePath, pageSources);
     content = await nodeProcessor.process(this.pageConfig.sourcePath, content);
diff --git a/packages/core/src/Page/page.njk b/packages/core/src/Page/page.njk
index 5d99b2df9a..5acbb54949 100644
--- a/packages/core/src/Page/page.njk
+++ b/packages/core/src/Page/page.njk
@@ -41,6 +41,8 @@
 <body {% if hasPageNav %} data-spy="scroll" data-target="#mb-page-nav" data-offset="100" {% endif %}>
 {{ content }}
 </body>
+{{- pageUserScriptsAndStyles -}}
+{{- layoutUserScriptsAndStyles -}}
 <script src="{{ asset.bootstrapUtilityJs }}"></script>
 <script>
   {% if enableSearch %}MarkBind.setupWithSearch(){% else %}MarkBind.setup(){% endif %}
diff --git a/packages/core/src/html/NodeProcessor.js b/packages/core/src/html/NodeProcessor.js
index e593006bbd..b719e33855 100644
--- a/packages/core/src/html/NodeProcessor.js
+++ b/packages/core/src/html/NodeProcessor.js
@@ -27,7 +27,7 @@ const {
 const { MdAttributeRenderer } = require('./MdAttributeRenderer');
 const { shiftSlotNodeDeeper, transformOldSlotSyntax } = require('./vueSlotSyntaxProcessor');
 const { warnConflictingAtributesMap, warnDeprecatedAtributesMap } = require('./warnings');
-const { processScriptTag, processStyleTag } = require('./scriptAndStyleTagProcessor');
+const { processScriptAndStyleTag } = require('./scriptAndStyleTagProcessor');
 const { createErrorNode } = require('./elements');
 
 const fsUtil = require('../utils/fsUtil');
@@ -42,13 +42,14 @@ const {
 cheerio.prototype.options.decodeEntities = false; // Don't escape HTML entities
 
 class NodeProcessor {
-  constructor(config, pageSources, variableProcessor, pluginManager, docId = '') {
+  constructor(config, pageSources, variableProcessor, pluginManager, userScriptsAndStyles, docId = '') {
     this.config = config;
     this.frontMatter = {};
 
     this.headTop = [];
     this.headBottom = [];
     this.scriptBottom = [];
+    this.userScriptsAndStyles = userScriptsAndStyles;
 
     this.pageSources = pageSources;
     this.variableProcessor = variableProcessor;
@@ -190,10 +191,8 @@ class NodeProcessor {
         this.footnoteProcessor.processMbTempFootnotes(node);
         break;
       case 'script':
-        processScriptTag(node);
-        break;
       case 'style':
-        processStyleTag(node);
+        processScriptAndStyleTag(node, this.userScriptsAndStyles);
         break;
       case 'code':
       case 'annotation': // Annotations are added automatically by KaTeX when rendering math formulae.
diff --git a/packages/core/src/html/scriptAndStyleTagProcessor.js b/packages/core/src/html/scriptAndStyleTagProcessor.js
index d0d9bd7054..946503b6bd 100644
--- a/packages/core/src/html/scriptAndStyleTagProcessor.js
+++ b/packages/core/src/html/scriptAndStyleTagProcessor.js
@@ -1,44 +1,33 @@
-/**
- * Adds attribute "type=application/javascript" to <script> tag.
- *
- * This is necessary because we are pre-compiling each page as a Vue application,
- * where the Vue compilation ignores and discards the <script> tag.
- *
- * By having this attribute, the compilation will ignore the <script> tag but not discard it.
- *
- * @param {Object<any, any>} node from the dom traversal
- */
-function processScriptTag(node) {
-  node.attribs.type = 'application/javascript';
-}
+const cheerio = require('cheerio');
 
 /**
- * Changes <style> tag into placeholder tag:
- * <script src defer type="application/javascript" style-bypass-vue-compilation>.
+ * Removes every script and style node (written by the user) encountered in the main app,
+ * and records all these script nodes in an array so that they can be hoisted to after
+ * <body> tag at a later stage.
  *
- * This is necessary because we are pre-compiling each page as a Vue application,
- * where the Vue compilation ignores and discards the <style> tag.
+ * This is to prevent Vue compilation of script/style tags (as they are not meant to be compiled).
  *
- * We work around this problem by piggybacking on the approach we used for <script> tags to be ignored
- * and not discarded; by changing <style> tags to the placeholder tag as shown above.
- * We will change it back to <style> tag after Vue compilation and after the element is created by Vue.
- *
- * @param {Object<any, any>} node from the dom traversal
+ * @param node {Object<any, any>} node from the dom traversal
+ * @param userScriptsAndStyles {array} to store scripts and style tags for hoisting
  */
-function processStyleTag(node) {
-  node.name = 'script';
-  /*
-    This node is not intended to be ran as a script. Thus, we have to defer the execution of the script
-    until the node is restored as a style node (which is handled by MarkBind's script).
-    The defer attribute requires the src attribute to work. Thus, the src attribute is used as a dummy.
-  */
-  node.attribs.src = '';
-  node.attribs.defer = '';
-  node.attribs.type = 'application/javascript'; // to bypass Vue compilation as a script tag
-  node.attribs['style-bypass-vue-compilation'] = ''; // to allow specific query selection of this element
+function processScriptAndStyleTag(node, userScriptsAndStyles) {
+  // Do not process script/style tags that are meant to be inserted in head/bottom of HTML
+  const isHeadOrBottom = node.parent.name === 'head-top'
+    || node.parent.name === 'head-bottom' || node.parent.name === 'script-bottom';
+  // Do not process script/style tags that are from External
+  const isExternal = userScriptsAndStyles === undefined;
+  if (isHeadOrBottom || isExternal) {
+    return;
+  }
+
+  const idx = node.parent.children.indexOf(node);
+  if (idx !== -1) {
+    node.parent.children.splice(idx, 1);
+  }
+  node.parent = null;
+  userScriptsAndStyles.push(cheerio.html(node));
 }
 
 module.exports = {
-  processScriptTag,
-  processStyleTag,
+  processScriptAndStyleTag,
 };
