diff --git a/src/main/resources/static/browserconfig.xml b/src/main/resources/static/browserconfig.xml
index 92f78799..5aecc916 100644
--- a/src/main/resources/static/browserconfig.xml
+++ b/src/main/resources/static/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png?v=2"/>
+            <square150x150logo src="/mstile-150x150.png"/>
             <TileColor>#00aba9</TileColor>
         </tile>
     </msapplication>
diff --git a/src/main/resources/static/site.webmanifest b/src/main/resources/static/site.webmanifest
index 9330bf12..42f8bb0c 100644
--- a/src/main/resources/static/site.webmanifest
+++ b/src/main/resources/static/site.webmanifest
@@ -3,12 +3,12 @@
     "short_name": "Stirling PDF",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png?v=2",
+            "src": "/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/android-chrome-512x512.png?v=2",
+            "src": "/android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }
diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html
index 440a2ea3..18d5a853 100644
--- a/src/main/resources/templates/fragments/common.html
+++ b/src/main/resources/templates/fragments/common.html
@@ -10,12 +10,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <!-- Icons -->
-    <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png?v=2">
-    <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png?v=2">
-    <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png?v=2">
-    <link rel="manifest" href="site.webmanifest?v=2">
-    <link rel="mask-icon" href="safari-pinned-tab.svg?v=2" color="#ca2b2a">
-    <link rel="shortcut icon" href="favicon.ico?v=2">
+    <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
+    <link rel="manifest" href="site.webmanifest">
+    <link rel="mask-icon" href="safari-pinned-tab.svg" color="#ca2b2a">
+    <link rel="shortcut icon" href="favicon.ico">
     <meta name="apple-mobile-web-app-title" content="Stirling PDF">
     <meta name="application-name" content="Stirling PDF">
     <meta name="msapplication-TileColor" content="#00aba9">
@@ -35,42 +35,42 @@
     <link rel="stylesheet" href="css/bootstrap-icons.min.css">
 
     <!-- PDF.js -->
-    <script th:src="@{pdfjs/pdf.js}"></script>
+    <script src="pdfjs/pdf.js"></script>
 
     <!-- PDF-Lib -->
     <script src="js/thirdParty/pdf-lib.min.js"></script>
 
     <!-- Custom -->
-    <link rel="stylesheet" href="css/general.css?v=2">
-    <link rel="stylesheet" th:href="@{css/theme/theme.css?v=2}">
-    <link rel="stylesheet" th:href="@{css/theme/componentes.css?v=2}">
-    <link rel="stylesheet" th:href="@{css/theme/theme.light.css?v=2}" id="light-mode-styles">
-    <link rel="stylesheet" th:href="@{css/theme/theme.dark.css?v=2}" id="dark-mode-styles">
-    <link rel="stylesheet" th:href="@{css/rainbow-mode.css?v=2}" id="rainbow-mode-styles" disabled>
-    <link rel="stylesheet" href="css/tab-container.css?v=2">
-    <link rel="stylesheet" href="css/navbar.css?v=2">
+    <link rel="stylesheet" href="css/general.css">
+    <link rel="stylesheet" href="css/theme/theme.css">
+    <link rel="stylesheet" href="css/theme/componentes.css">
+    <link rel="stylesheet" href="css/theme/theme.light.css" id="light-mode-styles">
+    <link rel="stylesheet" href="css/theme/theme.dark.css" id="dark-mode-styles">
+    <link rel="stylesheet" href="css/rainbow-mode.css" id="rainbow-mode-styles" disabled>
+    <link rel="stylesheet" href="css/tab-container.css">
+    <link rel="stylesheet" href="css/navbar.css">
 
-    <link rel="stylesheet" th:href="@{/css/error.css?v=2}" th:if="${error}">
+    <link rel="stylesheet" href="css/error.css" th:if="${error}">
 
-    <link rel="stylesheet" href="css/home.css?v=2" th:if="${currentPage == 'home'}">
-    <link rel="stylesheet" href="css/account.css?v=2" th:if="${currentPage == 'account'}">
-    <link rel="stylesheet" href="css/licenses.css?v=2" th:if="${currentPage == 'licenses'}">
-    <link rel="stylesheet" href="css/multi-tool.css?v=2" th:if="${currentPage == 'multi-tool'}">
-    <link rel="stylesheet" href="css/rotate-pdf.css?v=2" th:if="${currentPage == 'rotate-pdf'}">
-    <link rel="stylesheet" href="css/stamp.css?v=2" th:if="${currentPage == 'stamp'}">
-    <link rel="stylesheet" href="css/fileSelect.css?v=2">
-    <link rel="stylesheet" href="css/footer.css?v=2">
+    <link rel="stylesheet" href="css/home.css" th:if="${currentPage == 'home'}">
+    <link rel="stylesheet" href="css/account.css" th:if="${currentPage == 'account'}">
+    <link rel="stylesheet" href="css/licenses.css" th:if="${currentPage == 'licenses'}">
+    <link rel="stylesheet" href="css/multi-tool.css" th:if="${currentPage == 'multi-tool'}">
+    <link rel="stylesheet" href="css/rotate-pdf.css" th:if="${currentPage == 'rotate-pdf'}">
+    <link rel="stylesheet" href="css/stamp.css" th:if="${currentPage == 'stamp'}">
+    <link rel="stylesheet" href="css/fileSelect.css">
+    <link rel="stylesheet" href="css/footer.css">
     <script src="js/thirdParty/fontfaceobserver.standalone.js"></script>
 
     <!-- Google MD Icons -->
     <link rel="stylesheet" href="css/theme/font.css">
 
     <!-- Help Modal -->
-    <link rel="stylesheet" href="css/errorBanner.css?v=2">
+    <link rel="stylesheet" href="css/errorBanner.css">
 
-    <script src="js/cacheFormInputs.js?v=2"></script>
-    <script src="js/tab-container.js?v=2"></script>
-    <script src="js/darkmode.js?v=2"></script>
+    <script src="js/cacheFormInputs.js"></script>
+    <script src="js/tab-container.js"></script>
+    <script src="js/darkmode.js"></script>
   </th:block>
 
 <th:block th:fragment="game">
@@ -140,7 +140,7 @@
         <div id="level">Level: 1</div>
         <img src="favicon.svg" class="player" id="player" alt="favicon">
       </div>
-      <link rel="stylesheet" href="css/game.css?v=2">
+      <link rel="stylesheet" href="css/game.css">
     </dialog>
 </th:block>
 
@@ -150,7 +150,7 @@
                   const multiple = [[${multiple}]] || false;
                   const remoteCall = [[${remoteCall}]] || true;
                 </script>
-                <script src="js/downloader.js?v=2"></script>
+                <script src="js/downloader.js"></script>
 
                 <div class="custom-file-chooser" th:attr="data-bs-unique-id=${name}, data-bs-element-id=${name+'-input'}, data-bs-files-selected=#{filesSelected}, data-bs-pdf-prompt=#{pdfPrompt}">
                   <div class="mb-3">
@@ -166,5 +166,5 @@
                     </div>
                   </div>
                 </div>
-                <script src="js/fileInput.js?v=2"></script>
+                <script src="js/fileInput.js"></script>
 </th:block>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index 1497df1e..9a3c4ca7 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -5,11 +5,11 @@
     const noFavourites = /*[[#{noFavourites}]]*/ '';
     const updateAvailable =  /*[[#{settings.updateAvailable}]]*/ '';
   </script>
-  <script th:src="@{js/githubVersion.js}"></script>
+  <script src="js/githubVersion.js"></script>
   <nav class="navbar navbar-expand-lg">
     <div class="container ">
-      <a class="navbar-brand" href="#" th:href="@{/}" style="display: flex;">
-        <img class="main-icon" src="favicon.svg?v=2" alt="icon">
+      <a class="navbar-brand" href="/" style="display: flex;">
+        <img class="main-icon" src="favicon.svg" alt="icon">
         <span class="icon-text" th:text="${@navBarText}"></span>
       </a>
       <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index 2b0298b1..527df0fd 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -21,7 +21,7 @@
       </div>
       <br class="d-md-none">
       <!-- Features -->
-      <script src="js/homecard.js?v=2"></script>
+      <script src="js/homecard.js"></script>
       <div class=" container">
         <br>
         <span class="material-symbols-rounded search-icon">
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html
index b97a44b2..1ddea9db 100644
--- a/src/main/resources/templates/login.html
+++ b/src/main/resources/templates/login.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{login.title}, header=#{login.header})}"></th:block>
-    <link rel="stylesheet" href="css/login.css?v=2">
+    <link rel="stylesheet" href="css/login.css">
   </head>
 
   <body>
@@ -113,7 +113,7 @@
           }
         </script>
         <div class="text-center">
-          <img class="mb-4" src="favicon.svg?v=2" alt="favicon" width="144" height="144">
+          <img class="mb-4" src="favicon.svg" alt="favicon" width="144" height="144">
 
           <h1 class="h1 mb-3 fw-normal" th:text="${@appName}">Stirling-PDF</h1>
           <div th:if="${oAuth2Enabled}">
diff --git a/src/main/resources/templates/sign.html b/src/main/resources/templates/sign.html
index a7bb7bff..7b6347e2 100644
--- a/src/main/resources/templates/sign.html
+++ b/src/main/resources/templates/sign.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{sign.title}, header=#{sign.header})}"></th:block>
-    <link rel="stylesheet" href="css/sign.css?v=2">
+    <link rel="stylesheet" href="css/sign.css">
   <th:block th:each="font : ${fonts}">
     <style th:inline="text">
       @font-face {
diff --git a/src/main/resources/templates/split-pdf-by-sections.html b/src/main/resources/templates/split-pdf-by-sections.html
index cc4d0cc2..9790b1b2 100644
--- a/src/main/resources/templates/split-pdf-by-sections.html
+++ b/src/main/resources/templates/split-pdf-by-sections.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.language}" th:dir="#{language.direction}" th:data-language="${#locale.toString()}" xmlns:th="http://www.thymeleaf.org">
   <head>
   <th:block th:insert="~{fragments/common :: head(title=#{split-by-sections.title}, header=#{split-by-sections.header})}"></th:block>
-    <link rel="stylesheet" href="css/split-pdf-by-sections.css?v=2">
+    <link rel="stylesheet" href="css/split-pdf-by-sections.css">
   </head>
 
   <body>
diff --git a/src/main/resources/templates/view-pdf.html b/src/main/resources/templates/view-pdf.html
index e14163be..3f7a1504 100644
--- a/src/main/resources/templates/view-pdf.html
+++ b/src/main/resources/templates/view-pdf.html
@@ -32,11 +32,11 @@ See https://github.com/adobe-type-tools/cmap-resources
 <script src="js/thirdParty/bootstrap.min.js"></script>
 
     <!-- This snippet is used in production (included from view-pdf.html) -->
-    <link rel="resource" type="application/l10n" th:href="@{pdfjs/locale/locale.properties}">
-    <script th:src="@{pdfjs/pdf.js}" type="module"></script>
+    <link rel="resource" type="application/l10n" href="pdfjs/locale/locale.properties">
+    <script src="pdfjs/pdf.js" type="module"></script>
 
-    <link rel="stylesheet" th:href="@{pdfjs/css/viewer.css}">
-    <script th:src="@{pdfjs/js/viewer.js}" type="module"></script>
+    <link rel="stylesheet" href="pdfjs/css/viewer.css">
+    <script src="pdfjs/js/viewer.js" type="module"></script>
 </head>
 
 <body tabindex="1">
@@ -348,7 +348,7 @@ See https://github.com/adobe-type-tools/cmap-resources
 
                         <a id="backToHome" class="toolbarButton hiddenLargeView" title="Back to Main Page"
                            tabindex="30"
-                           data-l10n-id="back_to_home" th:href="@{/}">
+                           data-l10n-id="back_to_home" href="/">
                             <span data-l10n-id="back_to_home_label">Back to Main Page</span>
                         </a>