diff --git a/src/main/resources/templates/convert/pdf-to-pdfa.html b/src/main/resources/templates/convert/pdf-to-pdfa.html
index e9b8ac88..6494cf9c 100644
--- a/src/main/resources/templates/convert/pdf-to-pdfa.html
+++ b/src/main/resources/templates/convert/pdf-to-pdfa.html
@@ -14,7 +14,7 @@
           <div class="row justify-content-center">
             <div class="col-md-6">
               <h2 th:text="#{pdfToPDFA.header}"></h2>
-              <p>Currently doesn't work for multiple inputs at once</p>
+              <p th:text="#{pdfToPDFA.tip}"></p>
               <form method="post" enctype="multipart/form-data" th:action="@{api/v1/convert/pdf/pdfa}">
                 <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                 <br>
diff --git a/src/main/resources/templates/extract-page.html b/src/main/resources/templates/extract-page.html
index c10485b8..9d97b3b4 100644
--- a/src/main/resources/templates/extract-page.html
+++ b/src/main/resources/templates/extract-page.html
@@ -18,7 +18,7 @@
                 <input type="hidden" id="customMode" name="customMode" value="">
                 <div class="mb-3">
                   <label for="pageOrder" th:text="#{pageOrderPrompt}"></label>
-                  <input type="text" class="form-control" id="pageOrder" name="pageNumbers" placeholder="(e.g. 1,2,8 or 4,7,12-16 or 2n-1)" required>
+                  <input type="text" class="form-control" id="pageOrder" name="pageNumbers" th:placeholder="#{pageExtracter.placeholder}" required>
                 </div>
 
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{pageExtracter.submit}"></button>
diff --git a/src/main/resources/templates/misc/add-image.html b/src/main/resources/templates/misc/add-image.html
index 04e0dfc5..86bc6bab 100644
--- a/src/main/resources/templates/misc/add-image.html
+++ b/src/main/resources/templates/misc/add-image.html
@@ -88,7 +88,7 @@
 
               <!-- download button -->
               <div class="margin-auto-parent">
-                <button id="download-pdf" class="btn btn-primary mb-2 show-on-file-selected margin-center">Download PDF</button>
+                <button id="download-pdf" class="btn btn-primary mb-2 show-on-file-selected margin-center" th:text="#{downloadPdf}"></button>
               </div>
               <script>
                 document.getElementById("download-pdf").addEventListener('click', async() => {
diff --git a/src/main/resources/templates/pdf-organizer.html b/src/main/resources/templates/pdf-organizer.html
index 9f69c95c..4466fa23 100644
--- a/src/main/resources/templates/pdf-organizer.html
+++ b/src/main/resources/templates/pdf-organizer.html
@@ -17,22 +17,22 @@
               <form th:action="@{api/v1/general/rearrange-pages}" method="post" enctype="multipart/form-data">
                 <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                 <div class="mb-3">
-                  <label for="customMode">Mode</label>
+                  <label for="customMode" th:text="#{pdfOrganiser.mode}">Mode</label>
                   <select class="form-control" id="customMode" name="customMode">
-                    <option value="">Custom Page Order</option>
-                    <option value="REVERSE_ORDER">Reverse Order</option>
-                    <option value="DUPLEX_SORT">Duplex Sort</option>
-                    <option value="BOOKLET_SORT">Booklet Sort</option>
-                    <option value="SIDE_STITCH_BOOKLET_SORT">Side Stitch Booklet Sort</option>
-                    <option value="ODD_EVEN_SPLIT">Odd-Even Split</option>
-                    <option value="REMOVE_FIRST">Remove First</option>
-                    <option value="REMOVE_LAST">Remove Last</option>
-                    <option value="REMOVE_FIRST_AND_LAST">Remove First and Last</option>
+                    <option value="" th:text="#{pdfOrganiser.mode.1}">Custom Page Order</option>
+                    <option value="REVERSE_ORDER" th:text="#{pdfOrganiser.mode.2}">Reverse Order</option>
+                    <option value="DUPLEX_SORT" th:text="#{pdfOrganiser.mode.3}">Duplex Sort</option>
+                    <option value="BOOKLET_SORT" th:text="#{pdfOrganiser.mode.4}">Booklet Sort</option>
+                    <option value="SIDE_STITCH_BOOKLET_SORT" th:text="#{pdfOrganiser.mode.5}">Side Stitch Booklet Sort</option>
+                    <option value="ODD_EVEN_SPLIT" th:text="#{pdfOrganiser.mode.6}">Odd-Even Split</option>
+                    <option value="REMOVE_FIRST" th:text="#{pdfOrganiser.mode.7}">Remove First</option>
+                    <option value="REMOVE_LAST" th:text="#{pdfOrganiser.mode.8}">Remove Last</option>
+                    <option value="REMOVE_FIRST_AND_LAST" th:text="#{pdfOrganiser.mode.9}">Remove First and Last</option>
                   </select>
                 </div>
                 <div class="mb-3">
                   <label for="pageOrder" th:text="#{pageOrderPrompt}"></label>
-                  <input type="text" class="form-control" id="pageOrder" name="pageNumbers" placeholder="(e.g. 1,3,2 or 4-8,2,10-12 or 2n-1)" required>
+                  <input type="text" class="form-control" id="pageOrder" name="pageNumbers" th:placeholder="#{pdfOrganiser.placeholder}" required>
                 </div>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{pdfOrganiser.submit}"></button>
               </form>
diff --git a/src/main/resources/templates/pipeline.html b/src/main/resources/templates/pipeline.html
index 04887c0c..b59d68c0 100644
--- a/src/main/resources/templates/pipeline.html
+++ b/src/main/resources/templates/pipeline.html
@@ -42,9 +42,9 @@
                 <div class="element-margin">
                   <button class="btn btn-primary" id="submitConfigBtn" th:text="#{pipeline.submitButton}"></button>
                 </div>
-                <a href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/PipelineFeature.md" target="_blank">Pipeline Help</a>
+                <a href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/PipelineFeature.md" target="_blank" th:text="#{pipeline.help}">Pipeline Help</a>
                 <br>
-                <a href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/FolderScanning.md" target="_blank">Folder Scanning Help</a>
+                <a href="https://github.com/Stirling-Tools/Stirling-PDF/blob/main/FolderScanning.md" target="_blank" th:text="#{pipeline.scanHelp}">Folder Scanning Help</a>
               </div>
             </div>
 
diff --git a/src/main/resources/templates/remove-pages.html b/src/main/resources/templates/remove-pages.html
index 9e8a8bc5..cd9e57d5 100644
--- a/src/main/resources/templates/remove-pages.html
+++ b/src/main/resources/templates/remove-pages.html
@@ -18,7 +18,7 @@
                 <div th:replace="~{fragments/common :: fileSelector(name='fileInput', multiple=false, accept='application/pdf')}"></div>
                 <div class="mb-3">
                   <label for="fileInput" th:text="#{pageRemover.pagesToDelete}"></label>
-                  <input type="text" class="form-control" id="fileInput" name="pageNumbers" placeholder="(e.g. 1,2,6 or 1-10,15-30)" required>
+                  <input type="text" class="form-control" id="fileInput" name="pageNumbers" th:placeholder="#{pageRemover.placeholder}" required>
                 </div>
                 <button type="submit" id="submitBtn" class="btn btn-primary" th:text="#{pageRemover.submit}"></button>
               </form>
diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html
index 1195f2c4..ad3b1eec 100644
--- a/src/main/resources/templates/security/add-watermark.html
+++ b/src/main/resources/templates/security/add-watermark.html
@@ -25,8 +25,8 @@
                 <div class="mb-3">
                   <label th:text="#{watermark.selectText.8}"></label>
                   <select class="form-control" id="watermarkType" name="watermarkType" onchange="toggleFileOption()">
-                    <option value="text">Text</option>
-                    <option value="image">Image</option>
+                    <option value="text" th:text="#{watermark.type.1}"></option>
+                    <option value="image" th:text="#{watermark.type.1}"></option>
                   </select>
                 </div>
                 <div id="alphabetGroup" class="mb-3">
diff --git a/src/main/resources/templates/sign.html b/src/main/resources/templates/sign.html
index 25f7bb04..259d5e97 100644
--- a/src/main/resources/templates/sign.html
+++ b/src/main/resources/templates/sign.html
@@ -249,7 +249,7 @@
 
               <!-- download button -->
               <div class="margin-auto-parent">
-                <button id="download-pdf" class="btn btn-primary mb-2 show-on-file-selected margin-center">Download PDF</button>
+                <button id="download-pdf" class="btn btn-primary mb-2 show-on-file-selected margin-center" th:text="#{downloadPdf}"></button>
               </div>
 
               <script>