diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties
index e4dbc44c3..e69de29bb 100644
--- a/src/main/resources/messages.properties
+++ b/src/main/resources/messages.properties
@@ -1,4 +0,0 @@
-greeting=Hello! Welcome to our website!
-lang.change=Change the language
-lang.eng=English
-lang.fr=French
\ No newline at end of file
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
new file mode 100644
index 000000000..41dfddca4
--- /dev/null
+++ b/src/main/resources/messages_en.properties
@@ -0,0 +1,203 @@
+###########
+# Generic #
+###########
+pdfPrompt=Choose PDF
+multiPdfPrompt=Choose PDFs (2+)
+multiPdfDropPrompt=Select (or drag & drop) all PDFs you require
+imgPrompt=Choose Image
+genericSubmit=Submit
+processTimeWarning=Warning: This process can take up to a minute depending on file-size
+pageOrderPrompt=Page Order (Enter a comma-separated list of page numbers) :
+
+#############
+# HOME-PAGE #
+#############
+home.desc=Your locally hosted one-stop-shop for all your PDF needs.
+
+home.merge.title=Merge PDFs
+home.merge.desc=Easily merge multiple PDFs into one.
+
+home.split.title=Split PDFs
+home.split.desc=Split PDFs into multiple documents
+
+home.rotate.title=Rotate PDFs
+home.rotate.desc=Easily rotate your PDFs.
+
+home.imageToPdf.title=Image to PDF
+home.imageToPdf.desc=Convert a images (PNG, JPEG, GIF) to PDF.
+
+home.pdfToImage.title=PDF to Image
+home.pdfToImage.desc=Convert a PDF to a image. (PNG, JPEG, GIF)
+
+home.pdfOrganiser.title=PDF Organizer
+home.pdfOrganiser.desc=Remove/Rearrange pages in any order
+
+home.addImage.title=Add image onto PDF
+home.addImage.desc=Adds a image onto a set location on the PDF (Work in progress)
+
+home.watermark.title=Add Watermark
+home.watermark.desc=Add a custom watermark to your PDF document.
+
+home.permissions.title=Change Permissions
+home.permissions.desc=Change the permissions of your PDF document
+
+home.removePages.title=Remove Pages
+home.removePages.desc=Delete unwanted pages from your PDF document.
+
+home.addPassword.title=Add Password
+home.addPassword.desc=Encrypt your PDF document with a password.
+
+home.removePassword.title=Remove Password
+home.removePassword.desc=Remove password protection from your PDF document.
+
+home.compressPdfs.title=Compress PDFs
+home.compressPdfs.desc=Compress PDFs to reduce their file size.
+
+
+
+#Add image
+addImage.title=Add Image
+addImage.header=Add image to PDF (Work in progress)
+
+#compress
+compress.title=Compress
+compress.header=Compress PDF
+compress.compressLevel=Value between 1 and 100 (1 being most reduced)
+
+
+
+#merge
+merge.title=Merge
+merge.header=Merge multiple PDFs (2+)
+
+#pdfOrganiser
+pdfOrganiser.title=Page Organizer
+pdfOrganiser.header=PDF Page Organizer
+pdfOrganiser.submit=Rearrange Pages
+
+
+#pageRemover
+pageRemover.title=Page Remover
+pageRemover.header=PDF Page remover
+pageRemover.pagesToDelete=Pages to delete (Enter a comma-separated list of page numbers) :
+pageRemover.submit=Delete Pages
+
+#rotate
+rotate.title=Rotate
+rotate.header=Rotate PDF
+rotate.selectAngle=Select rotation angle (in multiples of 90 degrees):
+rotate.submit=Rotate
+
+
+
+
+
+
+
+
+
+
+
+#merge
+split.title=Split
+split.header=Split PDF
+split.desc.1=The numbers you select are the page number you wish to do a split on
+split.desc.2=As such selecting 1,3,7-8 would split a 10 page document into 6 separate PDFS with:
+split.desc.3=Document #1: Page 1
+split.desc.4=Document #2: Page 2 and 3
+split.desc.5=Document #3: Page 4, 5 and 6
+split.desc.6=Document #4: Page 7
+split.desc.7=Document #5: Page 8
+split.desc.8=Document #6: Page 9 and 10
+split.splitPages=Enter pages to split on:
+
+
+
+#merge
+imageToPDF.title=Image to PDF
+imageToPDF.header=Image to PDF
+imageToPDF.submit=Convert
+
+#pdfToImage
+pdfToImage.title=PDF to Image
+pdfToImage.header=PDF to Image
+pdfToImage.selectText=Image Format
+pdfToImage.submit=Convert
+
+#addPassword
+addPassword.title=Add Password
+addPassword.header=Add password (Encrypt)
+addPassword.selectText.1=Select PDF to encrypt
+addPassword.selectText.2=Password
+addPassword.selectText.3=Encryption Key Length
+addPassword.selectText.4=Higher values are stronger, but lower values have better compatibility.
+addPassword.selectText.5=Permissions to set
+addPassword.selectText.6=Prevent assembly of document
+addPassword.selectText.7=Prevent content extraction
+addPassword.selectText.8=Prevent extraction for accessibility
+addPassword.selectText.9=Prevent filling in form
+addPassword.selectText.10=Prevent modification
+addPassword.selectText.11=Prevent annotation modification
+addPassword.selectText.12=Prevent printing
+addPassword.selectText.13=Prevent printing different formats
+addPassword.submit=Encrypt
+
+#merge
+watermark.title=Add Watermark
+watermark.header=Add Watermark
+watermark.selectText.1=Select PDF to add watermark to:
+watermark.selectText.1=Watermark Text:
+watermark.selectText.1=Font Size:
+watermark.selectText.1=Rotation (0-360):
+watermark.selectText.1=widthSpacer (Space between each watermark horizontally):
+watermark.selectText.1=heightSpacer (Space between each watermark vertically):
+watermark.submit=Add Watermark
+
+
+th:text="#{addPassword.selectText.1}"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/resources/templates/add-image.html b/src/main/resources/templates/add-image.html
index 111775dd7..4cb56ddae 100644
--- a/src/main/resources/templates/add-image.html
+++ b/src/main/resources/templates/add-image.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
 
-<th:block th:insert="~{fragments/common :: head(title='Add-Image')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{addImage.title})}"></th:block>
 
 
 <body>
@@ -14,7 +14,7 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>Add image to PDF (Work in progress)</h2>
+				<h2 th:text="#{addImage.header}"></h2>
 
 
 
@@ -24,12 +24,12 @@
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose PDF</label>
+							class="custom-file-label" for="fileInput" th:text="#{pdfPrompt}"></label>
 					</div>
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput2"
 							name="fileInput2" required> <label
-							class="custom-file-label" for="fileInput2">Choose Image</label>
+							class="custom-file-label" for="fileInput2" th:text="#{imgPrompt}"></label>
 					</div>
 					<div class="form-group">
 						<label for="x">X</label> <input type="number" class="form-control"
@@ -39,7 +39,7 @@
 						<label for="y">Y</label> <input type="number" class="form-control"
 							id="y" name="y" step="0.01" required>
 					</div>
-					<button type="submit" class="btn btn-primary">Submit</button>
+					<button type="submit" class="btn btn-primary" th:text="#{genericSubmit}"></button>
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 
diff --git a/src/main/resources/templates/compress-pdf.html b/src/main/resources/templates/compress-pdf.html
index 7631ba4e6..23dda95fc 100644
--- a/src/main/resources/templates/compress-pdf.html
+++ b/src/main/resources/templates/compress-pdf.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
 
-<th:block th:insert="~{fragments/common :: head(title='Compress')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{compress.title})}"></th:block>
 
 
 <body>	<div id="page-container">
@@ -13,25 +13,23 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>Compress PDF</h2>
+				<h2 th:text="#{compress.header}"></h2>
 				<form action="#" th:action="@{compress-pdf}"
 					th:object="${rotateForm}" method="post"
 					enctype="multipart/form-data">
-					<p>Warning: This process can take up to a minute depending on
-						file-size</p>
+					<p th:text="#{processTimeWarning}"></p>
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose PDF</label>
+							class="custom-file-label" for="fileInput" th:text="#{pdfPrompt}"></label>
 					</div>
 					<div class="form-group">
-						<label for="imageCompressionLevel">Value between 1 and 100
-							(1 being most reduced)</label> <input type="number" class="form-control"
+						<label for="imageCompressionLevel" th:text="#{compress.compressLevel}"></label> <input type="number" class="form-control"
 							id="imageCompressionLevel" name="imageCompressionLevel" step="1"
 							value="1" min="1" max="100" required>
 					</div>
 
-					<button type="submit" class="btn btn-primary">Compress</button>
+					<button type="submit" class="btn btn-primary" th:text="#{compress.title}"></button>
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 
diff --git a/src/main/resources/templates/convert/img-to-pdf.html b/src/main/resources/templates/convert/img-to-pdf.html
index 48d8427ba..cdb5bc049 100644
--- a/src/main/resources/templates/convert/img-to-pdf.html
+++ b/src/main/resources/templates/convert/img-to-pdf.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='Image to PDF')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{imageToPDF.title})}"></th:block>
 
 
 <body>	<div id="page-container">
@@ -12,18 +12,18 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>Image to PDF</h2>
+				<h2 th:text="#{imageToPDF.header}"></h2>
 
 				<form method="post" enctype="multipart/form-data"
 					th:action="@{img-to-pdf}">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose Image</label>
+							class="custom-file-label" for="fileInput" th:text="#{imgPrompt}"></label>
 					</div>
 					<br>
 					<br>
-					<button type="submit" class="btn btn-primary">Convert</button>
+					<button type="submit" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button>
 
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
diff --git a/src/main/resources/templates/convert/pdf-to-img.html b/src/main/resources/templates/convert/pdf-to-img.html
index c37e0c812..291507b38 100644
--- a/src/main/resources/templates/convert/pdf-to-img.html
+++ b/src/main/resources/templates/convert/pdf-to-img.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='PDF to Image')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{pdfToImage})}"></th:block>
 
 
 <body>	<div id="page-container">
@@ -13,23 +13,23 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>PDF to Image</h2>
+				<h2 th:text="#{pdfToImage.header}"></h2>
 				<form method="post" enctype="multipart/form-data"
 					th:action="@{pdf-to-img}">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose PDF</label>
+							class="custom-file-label" for="fileInput" th:text="#{pdfPrompt}"></label>
 					</div>
 					<div class="form-group">
-						<label>Image Format</label> <select class="form-control"
+						<label th:text="#{pdfToImage.selectText}"></label> <select class="form-control"
 							name="imageFormat">
 							<option value="jpg">JPEG</option>
 							<option value="png">PNG</option>
 							<option value="gif">GIF</option>
 						</select>
 					</div>
-					<button type="submit" class="btn btn-primary">Convert</button>
+					<button type="submit" class="btn btn-primary" th:text="#{pdfToImage.submit}"></button>
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 
diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html
index d974f2664..c8904f6be 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/templates/home.html
@@ -33,30 +33,29 @@
 			<div class="jumbotron jumbotron-fluid" id="jumbotron">
 				<div class="container">
 					<h1 class="display-4">Stirling PDF</h1>
-					<p class="lead">Your locally hosted one-stop-shop for all your
-						PDF needs. (Made 100% in ChatGPT in 1 day as a experiment)</p>
+					<p class="lead" th:text="#{home.desc}"></p>					
 				</div>
 			</div>
 
 			<!-- Features -->
 			<div class="features-container container">
-				<div th:replace="~{fragments/card :: card(cardTitle='Merge PDFs', cardText='Easily merge multiple PDFs into one.', cardLink='merge-pdfs')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='Split PDFs', cardText='Split PDFs into multiple documents', cardLink='split-pdfs')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='Rotate PDFs', cardText='Easily rotate your PDFs.', cardLink='rotate-pdf')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.merge.title}, cardText=#{home.merge.desc}, cardLink='merge-pdfs')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.split.title}, cardText=#{home.split.desc}, cardLink='split-pdfs')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.rotate.title}, cardText=#{home.rotate.desc}, cardLink='rotate-pdf')}"></div>
 
-				<div th:replace="~{fragments/card :: card(cardTitle='Image to PDF', cardText='Convert a images (PNG, JPEG, GIF) to PDF.', cardLink='img-to-pdf')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='PDF to Image', cardText='Convert a PDF to a image. (PNG, JPEG, GIF)', cardLink='pdf-to-img')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='PDF Organizer', cardText='Remove/Rearrange pages in any order', cardLink='pdf-organizer')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.imageToPdf.title}, cardText=#{home.imageToPdf.desc}, cardLink='img-to-pdf')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.pdfToImage.title}, cardText=#{home.pdfToImage.desc}, cardLink='pdf-to-img')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.pdfOrganiser.title}, cardText=#{home.pdfOrganiser.desc}, cardLink='pdf-organizer')}"></div>
 
-				<div th:replace="~{fragments/card :: card(cardTitle='Add image onto PDF', cardText='Adds a image onto a set location on the PDF (Work in progress)', cardLink='add-image')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='Add Watermark', cardText='Add a custom watermark to your PDF document.', cardLink='add-watermark')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='Change Permissions', cardText='Change the permissions of your PDF document, such as print, copy, edit, etc.', cardLink='change-permissions')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.addImage.title}, cardText=#{home.addImage.desc}, cardLink='add-image')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.watermark.title}, cardText=#{home.watermark.desc}, cardLink='add-watermark')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.permissions.title}, cardText=#{home.permissions.desc}, cardLink='change-permissions')}"></div>
 
-				<div th:replace="~{fragments/card :: card(cardTitle='Remove Pages', cardText='Delete unwanted pages from your PDF document.', cardLink='remove-pages')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='Add Password', cardText='Encrypt your PDF document with a password.', cardLink='add-password')}"></div>
-				<div th:replace="~{fragments/card :: card(cardTitle='Remove Password', cardText='Remove password protection from your PDF document.', cardLink='remove-password')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.removePages.title}, cardText=#{home.removePages.desc}, cardLink='remove-pages')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.addPassword.title}, cardText=#{home.addPassword.desc}, cardLink='add-password')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.removePassword.title}, cardText=#{home.removePassword.desc}, cardLink='remove-password')}"></div>
 
-				<div th:replace="~{fragments/card :: card(cardTitle='Compress PDFs', cardText='Compress PDFs to reduce their file size.', cardLink='compress-pdf')}"></div>
+				<div th:replace="~{fragments/card :: card(cardTitle=#{home.compressPdfs.title}, cardText=#{home.compressPdfs.desc}, cardLink='compress-pdf')}"></div>
 
 			</div>
 		</div>
diff --git a/src/main/resources/templates/merge-pdfs.html b/src/main/resources/templates/merge-pdfs.html
index 9337393a5..1d5d08f9b 100644
--- a/src/main/resources/templates/merge-pdfs.html
+++ b/src/main/resources/templates/merge-pdfs.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='Merge PDFs')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{merge.title})}"></th:block>
 
 
 <body>	<div id="page-container">
@@ -12,22 +12,22 @@
 	<div class="container" id="dropContainer">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>Merge multiple PDFs (2+)</h2>
+				<h2></h2>
 				<form action="merge-pdfs" method="post"
 					enctype="multipart/form-data">
 					<div class="form-group">
-						<label>Select (or drag & drop) all PDFs to merge</label>
+						<label th:text="#{multiPdfDropPrompt}"></label>
 						<div class="custom-file">
 							<input type="file" class="custom-file-input" id="fileInput"
 								name="fileInput" multiple required> <label
-								class="custom-file-label">Choose PDFs</label>
+								class="custom-file-label" th:text="#{pdfPrompt}">s</label>
 						</div>
 					</div>
 					<div class="form-group">
 						<ul id="selectedFiles" class="list-group"></ul>
 					</div>
 					<div class="form-group text-center">
-						<button type="submit" class="btn btn-primary">Merge</button>
+						<button type="submit" class="btn btn-primary" th:text="#{merge.title}"></button>
 					</div>
 				</form>
 
diff --git a/src/main/resources/templates/pdf-organizer.html b/src/main/resources/templates/pdf-organizer.html
index 10d7e1a85..01c5615c6 100644
--- a/src/main/resources/templates/pdf-organizer.html
+++ b/src/main/resources/templates/pdf-organizer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='Organizer')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{pdfOrganiser.title})}"></th:block>
 
 
 <body>	<div id="page-container">
@@ -12,25 +12,21 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>PDF Page Organizer</h2>
-
-
-
+				<h2 th:text="#{pdfOrganiser.header}"></h2>
+				
 				<form th:action="@{rearrange-pages}" method="post"
 					enctype="multipart/form-data">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose PDF</label>
+							class="custom-file-label" for="fileInput" th:text="#{pdfPrompt}"></label>
 					</div>
 					<div class="form-group">
-						<label for="pageOrder">Page Order (Enter a comma-separated
-							list of page numbers) :</label> <input type="text" class="form-control"
+						<label for="pageOrder" th:text="#{pageOrderPrompt}"></label> <input type="text" class="form-control"
 							id="fileInput" name="pageOrder"
 							placeholder="(e.g. 1,3,2 or 4-8,2,10-12)" required>
 					</div>
-					<button type="submit" class="btn btn-primary">Rearrange
-						Pages</button>
+					<button type="submit" class="btn btn-primary" th:text="#{pdfOrganiser.submit}"></button>
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 
diff --git a/src/main/resources/templates/remove-pages.html b/src/main/resources/templates/remove-pages.html
index 06e6c25ee..ac6e573f5 100644
--- a/src/main/resources/templates/remove-pages.html
+++ b/src/main/resources/templates/remove-pages.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='Page Remover')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{pageRemover.title})}"></th:block>
 
 
 <body>	<div id="page-container">
@@ -12,23 +12,21 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>PDF Page remover</h2>
+				<h2 th:text="#{pageRemover.header}"></h2>
 
 				<form th:action="@{remove-pages}" method="post"
 					enctype="multipart/form-data">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose PDF</label>
+							class="custom-file-label" for="fileInput" th:text="#{pdfPrompt}"></label>
 					</div>
 					<div class="form-group">
-						<label for="pagesToDelete">Pages to delete (Enter a comma-separated
-							list of page numbers) :</label> <input type="text" class="form-control"
+						<label for="pagesToDelete" th:text="#{pageRemover.pagesToDelete}"></label> <input type="text" class="form-control"
 							id="fileInput" name="pagesToDelete"
 							placeholder="(e.g. 1,2,6 or 1-10,15-30)" required>
 					</div>
-					<button type="submit" class="btn btn-primary">Delete
-						Pages</button>
+					<button type="submit" class="btn btn-primary" th:text="#{pageRemover.submit}"></button>
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 
diff --git a/src/main/resources/templates/rotate-pdf.html b/src/main/resources/templates/rotate-pdf.html
index cd17e8aaf..95a76ad5a 100644
--- a/src/main/resources/templates/rotate-pdf.html
+++ b/src/main/resources/templates/rotate-pdf.html
@@ -2,7 +2,7 @@
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
 
-<th:block th:insert="~{fragments/common :: head(title='Rotate')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{rotate.title})}"></th:block>
 
 
 <body>	<div id="page-container">
@@ -13,7 +13,7 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>Rotate PDF</h2>
+				<h2 th:text="#{rotate.header}"></h2>
 
 
 
@@ -22,11 +22,10 @@
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose PDF</label>
+							class="custom-file-label" for="fileInput" th:text="#{pdfPrompt}"></label>
 					</div>
 
-					<label for="angle">Select rotation angle (in multiples of
-						90 degrees):</label> <select id="angle" class="form-control" name="angle">
+					<label for="angle" th:text="#{rotate.selectAngle}"></label> <select id="angle" class="form-control" name="angle">
 						<option value="90">90</option>
 						<option value="180">180</option>
 						<option value="270">270</option>
@@ -34,7 +33,7 @@
 						<option value="-180">-180</option>
 						<option value="-270">-270</option>
 					</select> <br>
-					<button type="submit" class="btn btn-primary">Rotate</button>
+					<button type="submit" class="btn btn-primary" th:text="#{compress.submit}"></button>
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 
diff --git a/src/main/resources/templates/security/add-password.html b/src/main/resources/templates/security/add-password.html
index ee1064689..fca33e653 100644
--- a/src/main/resources/templates/security/add-password.html
+++ b/src/main/resources/templates/security/add-password.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='Add Password')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{addPassword.title})}"></th:block>
 
 <body>	<div id="page-container">
 		<div id="content-wrap">
@@ -11,85 +11,78 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>Add password (Encrypt)</h2>
+				<h2 th:text="#{addPassword.header}"></h2>
 
 				<form action="add-password" method="post"
 					enctype="multipart/form-data">
 					<div class="form-group">
-						<label>Select PDF to encrypt</label>
+						<label th:text="#{addPassword.selectText.1}"></label>
 						<div class="custom-file">
 							<input type="file" class="custom-file-input" id="fileInput"
 								name="fileInput" required> <label
-								class="custom-file-label">Choose PDF</label>
+								class="custom-file-label" th:text="#{pdfPrompt}"></label>
 						</div>
 					</div>
 					<div class="form-group">
-						<label>Password</label> <input type="password"
+						<label th:text="#{addPassword.selectText.2}"></label> <input type="password"
 							class="form-control" id="password" name="password" required>
 					</div>
 					<div class="form-group">
-						<label>Encryption Key Length</label> <select class="form-control"
+						<label th:text="#{addPassword.selectText.3}"></label> <select class="form-control"
 							id="keyLength" name="keyLength">
 							<option value="40">40</option>
 							<option value="128">128</option>
 							<option value="256">256</option>
-						</select> <small class="form-text text-muted">Higher values are
-							stronger, but lower values have better compatibility.</small>
+						</select> <small class="form-text text-muted" th:text="#{addPassword.selectText.4}"></small>
 					</div>
 					<div class="form-group">
-						<label>Permissions to set</label>
+						<label th:text="#{addPassword.selectText.5}"></label>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox"
 								id="canAssembleDocument" name="canAssembleDocument"> <label
-								class="form-check-label" for="canAssembleDocument">
-								Prevent assembly of document </label>
+								class="form-check-label" for="canAssembleDocument" th:text="#{addPassword.selectText.6}"></label>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox"
 								id="canExtractContent" name="canExtractContent"> <label
-								class="form-check-label" for="canExtractContent">
-								Prevent content extraction </label>
+								class="form-check-label" for="canExtractContent" th:text="#{addPassword.selectText.7}"></label>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox"
 								id="canExtractForAccessibility"
 								name="canExtractForAccessibility"> <label
-								class="form-check-label" for="canExtractForAccessibility">
-								Prevent extraction for accessibility </label>
+								class="form-check-label" for="canExtractForAccessibility" th:text="#{addPassword.selectText.8}"></label>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox"
 								id="canFillInForm" name="canFillInForm"> <label
-								class="form-check-label" for="canFillInForm"> Prevent
-								filling in form </label>
+								class="form-check-label" for="canFillInForm" th:text="#{addPassword.selectText.9}"></label>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox" id="canModify"
 								name="canModify"> <label class="form-check-label"
-								for="canModify"> Prevent modification </label>
+								for="canModify" th:text="#{addPassword.selectText.10}"></label>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox"
 								id="canModifyAnnotations" name="canModifyAnnotations"> <label
-								class="form-check-label" for="canModifyAnnotations">
-								Prevent annotation modification </label>
+								class="form-check-label" for="canModifyAnnotations" th:text="#{addPassword.selectText.11}"></label>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox" id="canPrint"
 								name="canPrint"> <label class="form-check-label"
-								for="canPrint"> Prevent printing </label>
+								for="canPrint" th:text="#{addPassword.selectText.12}"></label>
 						</div>
 						<div class="form-check">
 							<input class="form-check-input" type="checkbox"
 								id="canPrintFaithful" name="canPrintFaithful"> <label
-								class="form-check-label" for="canPrintFaithful"> Prevent
-								printing different formats </label>
+								class="form-check-label" for="canPrintFaithful" th:text="#{addPassword.selectText.13}"></label>
 						</div>
 
 					</div>
 					<br />
 					<div class="form-group text-center">
-						<button type="submit" class="btn btn-primary">Encrypt</button>
+						<button type="submit" class="btn btn-primary" th:text="#{addPassword.submit}"></button>
 					</div>
 
 				</form>
diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html
index c67d8ee13..87974b323 100644
--- a/src/main/resources/templates/security/add-watermark.html
+++ b/src/main/resources/templates/security/add-watermark.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='Add Watermark')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{watermark.title})}"></th:block>
 
 <body>	<div id="page-container">
 		<div id="content-wrap">
@@ -11,39 +11,39 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h2>Add Watermark</h2>
+				<h2 th:text="#{watermark.header}"></h2>
 
 				<form method="post" enctype="multipart/form-data" action="add-watermark">
 		            <div class="form-group">
-						<label>Select PDF to add watermark to:</label>
+						<label th:text="#{watermark.selectText.1}"></label>
 						<div class="custom-file">
 							<input type="file" class="custom-file-input" id="fileInput"
 								name="fileInput" required> <label
-								class="custom-file-label">Choose PDF</label>
+								class="custom-file-label" th:text="#{pdfPrompt}"></label>
 						</div>
 					</div>
 		            <div class="form-group">
-		                <label for="watermarkText">Watermark Text:</label>
+		                <label for="watermarkText" th:text="#{watermark.selectText.2}"></label>
 		                <input type="text" id="watermarkText" name="watermarkText" class="form-control" placeholder="Stirling-PDF" required/>
 		            </div>
 		            <div class="form-group">
-		                <label for="fontSize">Font Size:</label>
+		                <label for="fontSize" th:text="#{watermark.selectText.3}"></label>
 		                <input type="text" id="fontSize" name="fontSize" class="form-control" value="30"/>
 		            </div>
 		            <div class="form-group">
-		                <label for="rotation">Rotation (0-360):</label>
+		                <label for="rotation" th:text="#{watermark.selectText.4}"></label>
 		                <input type="text" id="rotation" name="rotation" class="form-control"  value="45"/>
 		            </div>
 		            <div class="form-group">
-		                <label for="widthSpacer">widthSpacer (Space between each watermark horizontally):</label>
+		                <label for="widthSpacer" th:text="#{watermark.selectText.5}"></label>
 		                <input type="text" id="widthSpacer" name="widthSpacer" class="form-control" value="50"/>
 		            </div>
 		            <div class="form-group">
-		                <label for="heightSpacer">heightSpacer (Space between each watermark vertically):</label>
+		                <label for="heightSpacer" th:text="#{watermark.selectText.6}"></label>
 		                <input type="text" id="heightSpacer" name="heightSpacer" class="form-control" value="50"/>
 		            </div>
 		            <div class="form-group text-center">
-		                <input type="submit" value="Add Watermark" class="btn btn-primary"/>
+		                <input type="submit" th:value="#{watermark.submit}" class="btn btn-primary"/>
 		            </div>
         </form> 
 </div>
diff --git a/src/main/resources/templates/security/remove-password.html b/src/main/resources/templates/security/remove-password.html
index af3d61607..d760bb920 100644
--- a/src/main/resources/templates/security/remove-password.html
+++ b/src/main/resources/templates/security/remove-password.html
@@ -20,7 +20,7 @@
 						<div class="custom-file">
 							<input type="file" class="custom-file-input" id="fileInput"
 								name="fileInput" required> <label
-								class="custom-file-label">Choose PDF</label>
+								class="custom-file-label" th:text="#{pdfPrompt}"></label>
 						</div>
 					</div>
 					<div class="form-group">
diff --git a/src/main/resources/templates/split-pdfs.html b/src/main/resources/templates/split-pdfs.html
index 7239d9857..05a76086c 100644
--- a/src/main/resources/templates/split-pdfs.html
+++ b/src/main/resources/templates/split-pdfs.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
 
-<th:block th:insert="~{fragments/common :: head(title='Split')}"></th:block>
+<th:block th:insert="~{fragments/common :: head(title=#{split.title})}"></th:block>
 
 
 <body>
@@ -14,33 +14,31 @@
 	<div class="container">
 		<div class="row justify-content-center">
 			<div class="col-md-6">
-				<h1>Split PDF</h1>
-				<p>The numbers you select are the page number you wish to do a
-					split on</p>
-				<p>As such selecting 1,3,7-8 would split a 10 page document into
-					6 separate PDFS with:</p>
-				<p>Document #1: Page 1</p>
-				<p>Document #2: Page 2 and 3</p>
-				<p>Document #3: Page 4, 5 and 6</p>
-				<p>Document #4: Page 7</p>
-				<p>Document #5: Page 8</p>
-				<p>Document #6: Page 9 and 10</p>
+				<h1 th:text="#{split.header}"></h1>
+				<p th:text="#{split.desc.1}"></p>
+				<p th:text="#{split.desc.2}"></p>
+				<p th:text="#{split.desc.3}"></p>
+				<p th:text="#{split.desc.4}"></p>
+				<p th:text="#{split.desc.5}"></p>
+				<p th:text="#{split.desc.6}"></p>
+				<p th:text="#{split.desc.7}"></p>
+				<p th:text="#{split.desc.8}"></p>
 
 				<form th:action="@{split-pages}" method="post"
 					enctype="multipart/form-data">
 					<div class="custom-file">
 						<input type="file" class="custom-file-input" id="fileInput"
 							name="fileInput" required> <label
-							class="custom-file-label" for="fileInput">Choose PDF</label>
+							class="custom-file-label" for="fileInput" th:text="#{pdfPrompt}"></label>
 					</div>
 
 					<div class="form-group">
-						<label for="pages">Enter pages to split on:</label> <input
+						<label for="pages" th:text="#{split.splitPages}"></label> <input
 							type="text" class="form-control" id="pages" name="pages"
 							placeholder="1,3,5-10" required>
 					</div>
 					<br>
-					<button type="submit" class="btn btn-primary">Submit</button>
+					<button type="submit" class="btn btn-primary" th:text="#{genericSubmit}"></button>
 				</form>
 				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 			</div>