diff --git a/webui/src/main/webapp/AboutMe.jsp b/webui/src/main/webapp/AboutMe.jsp
index 8f9e8a5b..eb42c026 100644
--- a/webui/src/main/webapp/AboutMe.jsp
+++ b/webui/src/main/webapp/AboutMe.jsp
@@ -19,8 +19,7 @@ Core core = (Core) application.getAttribute("core");
 <html>
     <head>
 <%@include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/sign.js?<%=version%>" type ="text/javascript"></script>
+<script src="js/sign.js?<%=version%>" type ="text/javascript"></script>
 <script nonce="<%=cspNonce%>" type="text/javascript">
 function copyFullId() {
 	copyToClipboard("full-id")
diff --git a/webui/src/main/webapp/AdvancedSharing.jsp b/webui/src/main/webapp/AdvancedSharing.jsp
index 0ae354bb..8fe56e6b 100644
--- a/webui/src/main/webapp/AdvancedSharing.jsp
+++ b/webui/src/main/webapp/AdvancedSharing.jsp
@@ -13,10 +13,8 @@ String helptext = Util._t("Use this page to configure advanced settings for each
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/advancedSharing.js?<%=version%>" type="text/javascript"></script>
-<script type="text/javascript">
+<script src="js/advancedSharing.js?<%=version%>" type="text/javascript"></script>
+<script nonce="<%=cspNonce%>" type="text/javascript">
   openAccordion = 2;
 </script>
 	</head>
diff --git a/webui/src/main/webapp/BrowseHost.jsp b/webui/src/main/webapp/BrowseHost.jsp
index 5f98ec24..3cab9b13 100644
--- a/webui/src/main/webapp/BrowseHost.jsp
+++ b/webui/src/main/webapp/BrowseHost.jsp
@@ -22,10 +22,8 @@ if (request.getParameter("currentHost") != null) {
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/certificates.js?<%=version%> type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/browse.js?<%=version%>" type="text/javascript"></script>
+<script src="js/certificates.js?<%=version%>" type="text/javascript"></script>
+<script src="js/browse.js?<%=version%>" type="text/javascript"></script>
 
 <% if (currentBrowse != null) { %>
 	<script nonce="<%=cspNonce%>" type="text/javascript">
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index 24152bbe..94fcea43 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -27,7 +27,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 <html>
     <head>
 <%@include file="css.jsi"%>
-<script type="text/javascript">
+<script nonce="<%=cspNonce%>" type="text/javascript">
   openAccordion = 2;
 </script>
     </head>
diff --git a/webui/src/main/webapp/Downloads.jsp b/webui/src/main/webapp/Downloads.jsp
index 8ee7af57..dd701d85 100644
--- a/webui/src/main/webapp/Downloads.jsp
+++ b/webui/src/main/webapp/Downloads.jsp
@@ -18,8 +18,7 @@ String helptext = Util._t("This page shows the files you are currently downloadi
 <html>
     <head>
 <%@include file="css.jsi"%>
-	<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
-    <script nonce="<%=cspNonce%>" src="js/download.js?<%=version%>" type="text/javascript"></script>
+    <script src="js/download.js?<%=version%>" type="text/javascript"></script>
     </head>
     <body>
 <%@include file="header.jsi"%>    	
diff --git a/webui/src/main/webapp/Feeds.jsp b/webui/src/main/webapp/Feeds.jsp
index 24c4fdf9..41da5aed 100644
--- a/webui/src/main/webapp/Feeds.jsp
+++ b/webui/src/main/webapp/Feeds.jsp
@@ -16,10 +16,8 @@ String helptext = Util._t("Every MuWire user can have a file feed to publish sha
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/certificates.js?<%=version%> type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/feeds.js?<%=version%>" type="text/javascript"></script>
+<script src="js/certificates.js?<%=version%>" type="text/javascript"></script>
+<script src="js/feeds.js?<%=version%>" type="text/javascript"></script>
 
 	</head>
 	<body>
diff --git a/webui/src/main/webapp/FileDetails.jsp b/webui/src/main/webapp/FileDetails.jsp
index 5da0f865..c1ee5c9f 100644
--- a/webui/src/main/webapp/FileDetails.jsp
+++ b/webui/src/main/webapp/FileDetails.jsp
@@ -17,9 +17,7 @@ File file = Util.getFromPathElements(path);
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%> type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/fileDetails.js?<%=version%>" type="text/javascript"></script>
+<script src="js/fileDetails.js?<%=version%>" type="text/javascript"></script>
 
 <script nonce="<%=cspNonce%>" type="text/javascript">
 	path="<%=path%>"
diff --git a/webui/src/main/webapp/Home.jsp b/webui/src/main/webapp/Home.jsp
index e100991f..17315cdd 100644
--- a/webui/src/main/webapp/Home.jsp
+++ b/webui/src/main/webapp/Home.jsp
@@ -32,8 +32,7 @@
 <html>
 	<head>
 <%@include file="css.jsi"%>
-	<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
-	<script nonce="<%=cspNonce%>" src="js/certificates.js?<%=version%>" type="text/javascript"></script>
+	<script src="js/certificates.js?<%=version%>" type="text/javascript"></script>
 	<script nonce="<%=cspNonce%>" type="text/javascript">
 <% if (groupBy.equals("sender")) { %>
 		var bySender = true;
@@ -41,7 +40,7 @@
 		var bySender = false;
 <% } %>
 	</script>
-	<script nonce="<%=cspNonce%>" src="js/search.js?<%=version%>" type="text/javascript"></script>
+	<script src="js/search.js?<%=version%>" type="text/javascript"></script>
 <% if (request.getParameter("uuid") != null) {%>
 	<script nonce="<%=cspNonce%>" type="text/javascript">
 		uuid="<%=request.getParameter("uuid")%>"
diff --git a/webui/src/main/webapp/MuStatus.jsp b/webui/src/main/webapp/MuStatus.jsp
index 4407e9f7..af1b5655 100644
--- a/webui/src/main/webapp/MuStatus.jsp
+++ b/webui/src/main/webapp/MuStatus.jsp
@@ -17,7 +17,7 @@ String buildNumber = (String)application.getAttribute("buildNumber");
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/status.js?<%=version%>" type="text/javascript"></script>
+<script src="js/status.js?<%=version%>" type="text/javascript"></script>
 <script nonce="<%=cspNonce%>" type="text/javascript">
     openAccordion = 3;
 </script>
diff --git a/webui/src/main/webapp/SharedFiles.jsp b/webui/src/main/webapp/SharedFiles.jsp
index c3eede39..7bc5638f 100644
--- a/webui/src/main/webapp/SharedFiles.jsp
+++ b/webui/src/main/webapp/SharedFiles.jsp
@@ -19,12 +19,10 @@ if (viewAs == null)
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
 <% if (viewAs.equals("tree")) { %>
-	<script nonce="<%=cspNonce%>" src="js/files.js?<%=version%>" type="text/javascript"></script>
+	<script src="js/files.js?<%=version%>" type="text/javascript"></script>
 <% } else { %>
-	<script nonce="<%=cspNonce%>" src="js/filesTable.js?<%=version%>" type="text/javascript"></script>
+	<script src="js/filesTable.js?<%=version%>" type="text/javascript"></script>
 <% } %>
 
 	</head>
diff --git a/webui/src/main/webapp/TrustLists.jsp b/webui/src/main/webapp/TrustLists.jsp
index 1cd4c896..b3689c70 100644
--- a/webui/src/main/webapp/TrustLists.jsp
+++ b/webui/src/main/webapp/TrustLists.jsp
@@ -11,10 +11,8 @@ String helptext = Util._t("This page shows the trust lists of the users you have
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/trustLists.js?<%=version%>" type="text/javascript"></script>
-<script type="text/javascript">
+<script src="js/trustLists.js?<%=version%>" type="text/javascript"></script>
+<script nonce="<%=cspNonce%>" type="text/javascript">
   openAccordion = 1;
 </script>
 	</head>
diff --git a/webui/src/main/webapp/TrustUsers.jsp b/webui/src/main/webapp/TrustUsers.jsp
index 31d78be0..b155b127 100644
--- a/webui/src/main/webapp/TrustUsers.jsp
+++ b/webui/src/main/webapp/TrustUsers.jsp
@@ -12,10 +12,8 @@ String helptext = Util._t("This page shows the users you have marked as Trusted
 <html>
 	<head>
 <%@ include file="css.jsi"%>
-<script nonce="<%=cspNonce%>" src="js/util.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
-<script nonce="<%=cspNonce%>" src="js/trustUsers.js?<%=version%>" type="text/javascript"></script>
-<script type="text/javascript">
+<script src="js/trustUsers.js?<%=version%>" type="text/javascript"></script>
+<script nonce="<%=cspNonce%>" type="text/javascript">
   openAccordion = 1;
 </script>
 	</head>
diff --git a/webui/src/main/webapp/Uploads.jsp b/webui/src/main/webapp/Uploads.jsp
index c23683b9..17813819 100644
--- a/webui/src/main/webapp/Uploads.jsp
+++ b/webui/src/main/webapp/Uploads.jsp
@@ -18,8 +18,7 @@ String helptext = Util._t("This page shows the files you are currently uploading
 <html>
     <head>
 <%@include file="css.jsi"%>
-	<script nonce="<%=cspNonce%>" src="js/tables.js?<%=version%>" type="text/javascript"></script>
-    <script nonce="<%=cspNonce%>" src="js/upload.js?<%=version%>" type="text/javascript"></script>
+    <script src="js/upload.js?<%=version%>" type="text/javascript"></script>
     </head>
     <body>
 <%@include file="header.jsi"%>    	
diff --git a/webui/src/main/webapp/css.jsi b/webui/src/main/webapp/css.jsi
index f2b69173..64f9ffb6 100644
--- a/webui/src/main/webapp/css.jsi
+++ b/webui/src/main/webapp/css.jsi
@@ -14,9 +14,11 @@
 <link href="i2pbote.css?${version}" rel="stylesheet" type="text/css">
 <link href="muwire.css?${version}" rel="stylesheet" type="text/css">
 <link rel="icon" type="image/png" href="images/muwire.png" />
-<script src="js/conncount.js?${version}" nonce="<%=cspNonce%>" type="text/javascript"></script>
-<script src="js/translate.js?${version}" nonce="<%=cspNonce%>" type="text/javascript"></script>
-<script src="js/accordion.js?${version}" nonce="<%=cspNonce%>" type="text/javascript"></script>
+<script src="js/conncount.js?${version}" type="text/javascript"></script>
+<script src="js/translate.js?${version}" type="text/javascript"></script>
+<script src="js/accordion.js?${version}" type="text/javascript"></script>
+<script src="js/util.js?${version}" type="text/javascript"></script>
+<script src="js/tables.js?${version}" type="text/javascript"></script>
 <script nonce="<%=cspNonce%>" type="text/javascript">
   var jsTranslations = '<%=Util.getJSTranslations()%>';
 </script>
