diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index a3f7951d9..98867d259 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -20,6 +20,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		td {
@@ -54,6 +55,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 			float: left;
 		}
 
@@ -65,6 +67,11 @@
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
 			overflow: hidden;
+			color: {{ template_options.color3 }};
+		}
+
+		.fieldData {
+			color: {{ template_options.color4 }};
 		}
 
 		.table_class {
@@ -83,6 +90,7 @@
 			line-height: {{ template_options.line_spacing }};
 			max-height: 19vh;
 			overflow: hidden;
+			color: {{ template_options.color4 }};
 		}
 	</style>
 </head>
@@ -99,7 +107,7 @@
 								<td class="fieldTitle">
 									<h1> Dive No. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.number }} </h1>
 								</td>
 							</tr>
@@ -107,14 +115,15 @@
 								<td class="fieldTitle">
 									<h1> Date </h1>
 								</td>
-									<td><h1> {{ dive.date }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.date }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Location </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.location }} </h1>
 								</td>
 							</tr>
@@ -122,7 +131,7 @@
 								<td class="fieldTitle">
 									<h1> Max depth </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.depth }} </h1>
 								</td>
 							</tr>
@@ -130,7 +139,7 @@
 								<td class="fieldTitle">
 									<h1> Duration </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.duration }} </h1>
 								</td>
 							</tr>
@@ -140,7 +149,7 @@
 								<td class="fieldTitle">
 									<h1> Time. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.time }} </h1>
 								</td>
 							</tr>
@@ -148,14 +157,15 @@
 								<td class="fieldTitle">
 									<h1> Air Temp. </h1>
 								</td>
-									<td><h1> {{ dive.airTemp }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.airTemp }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Water Temp. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.waterTemp }} </h1>
 								</td>
 							</tr>
@@ -163,7 +173,7 @@
 								<td class="fieldTitle">
 									<h1> Buddy </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.buddy }} </h1>
 								</td>
 							</tr>
@@ -171,7 +181,7 @@
 								<td class="fieldTitle">
 									<h1> Dive Master </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.divemaster }} </h1>
 								</td>
 							</tr>
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 40c02b395..ff0d8cd40 100644
--- a/printing_templates/One Dive.html	
+++ b/printing_templates/One Dive.html	
@@ -20,6 +20,7 @@
 			box-sizing: border-box;
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		td {
@@ -57,6 +58,7 @@
 			box-sizing: border-box; 
 			border:max(1px, 0.1vw);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 			float: left;
 		}
 
@@ -75,6 +77,11 @@
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
 			overflow: hidden;
+			color: {{ template_options.color3 }};
+		}
+
+		.fieldData {
+			color: {{ template_options.color4 }};
 		}
 
 		.table_class {
@@ -91,6 +98,7 @@
 
 		.textArea {
 			line-height: {{ template_options.line_spacing }};
+			color: {{ template_options.color4 }};
 			max-height: 19vh;
 			overflow: hidden;
 		}
@@ -111,7 +119,7 @@
 								<td class="fieldTitle">
 									<h1> Dive No. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.number }} </h1>
 								</td>
 							</tr>
@@ -119,14 +127,15 @@
 								<td class="fieldTitle">
 									<h1> Date </h1>
 								</td>
-									<td><h1> {{ dive.date }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.date }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Location </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.location }} </h1>
 								</td>
 							</tr>
@@ -134,7 +143,7 @@
 								<td class="fieldTitle">
 									<h1> Max depth </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.depth }} </h1>
 								</td>
 							</tr>
@@ -142,7 +151,7 @@
 								<td class="fieldTitle">
 									<h1> Duration </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.duration }} </h1>
 								</td>
 							</tr>
@@ -152,7 +161,7 @@
 								<td class="fieldTitle">
 									<h1> Time. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.time }} </h1>
 								</td>
 							</tr>
@@ -160,14 +169,15 @@
 								<td class="fieldTitle">
 									<h1> Air Temp. </h1>
 								</td>
-									<td><h1> {{ dive.airTemp }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.airTemp }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Water Temp. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.waterTemp }} </h1>
 								</td>
 							</tr>
@@ -175,7 +185,7 @@
 								<td class="fieldTitle">
 									<h1> Buddy </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.buddy }} </h1>
 								</td>
 							</tr>
@@ -183,7 +193,7 @@
 								<td class="fieldTitle">
 									<h1> Dive Master </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.divemaster }} </h1>
 								</td>
 							</tr>
diff --git a/printing_templates/Table.html b/printing_templates/Table.html
index c97267405..2668ccb62 100644
--- a/printing_templates/Table.html
+++ b/printing_templates/Table.html
@@ -47,7 +47,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
-			border-color: color: {{ template_options.color5 }};
+			border-color: {{ template_options.color5 }};
 		}
 
 	</style>
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 5dba74303..463942ab5 100644
--- a/printing_templates/Two Dives.html	
+++ b/printing_templates/Two Dives.html	
@@ -40,6 +40,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		.table_class {
@@ -52,6 +53,7 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		.notes_table_class {
@@ -64,14 +66,20 @@
 			box-sizing: border-box;
 			border:max(0.1vw, 1px);
 			border-style:solid;
+			border-color: {{ template_options.color5 }};
 		}
 
 		.fieldTitle {
 			background-color: {{ template_options.color2 }};
+			color: {{ template_options.color3 }};
 			overflow: hidden;
 			padding:0;
 		}
 
+		.fieldData {
+			color: {{ template_options.color4 }};
+		}
+
 		.diveProfile {
 			width: 48%;
 			height: 95%;
@@ -122,7 +130,7 @@
 								<td class="fieldTitle">
 									<h1> Dive No. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.number }} </h1>
 								</td>
 							</tr>
@@ -130,14 +138,15 @@
 								<td class="fieldTitle">
 									<h1> Date </h1>
 								</td>
-									<td><h1> {{ dive.date }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.date }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Location </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.location }} </h1>
 								</td>
 							</tr>
@@ -145,7 +154,7 @@
 								<td class="fieldTitle">
 									<h1> Max depth </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.depth }} </h1>
 								</td>
 							</tr>
@@ -153,7 +162,7 @@
 								<td class="fieldTitle">
 									<h1> Duration </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.duration }} </h1>
 								</td>
 							</tr>
@@ -163,7 +172,7 @@
 								<td class="fieldTitle">
 									<h1> Time. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.time }} </h1>
 								</td>
 							</tr>
@@ -171,14 +180,15 @@
 								<td class="fieldTitle">
 									<h1> Air Temp. </h1>
 								</td>
-									<td><h1> {{ dive.airTemp }} </h1>
+								<td class="fieldData">
+									<h1> {{ dive.airTemp }} </h1>
 								</td>
 							</tr>
 							<tr>
 								<td class="fieldTitle">
 									<h1> Water Temp. </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.waterTemp }} </h1>
 								</td>
 							</tr>
@@ -186,7 +196,7 @@
 								<td class="fieldTitle">
 									<h1> Buddy </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.buddy }} </h1>
 								</td>
 							</tr>
@@ -194,7 +204,7 @@
 								<td class="fieldTitle">
 									<h1> Dive Master </h1>
 								</td>
-								<td>
+								<td class="fieldData">
 									<h1> {{ dive.divemaster }} </h1>
 								</td>
 							</tr>
@@ -210,7 +220,7 @@
 								</td>
 							</tr>
 							<tr>
-								<td>
+								<td class="fieldData">
 									<div class="textArea">
 										<h1> {{ dive.notes }} </h1>
 									</div>