diff --git a/theme/dive_export.html b/theme/dive_export.html
index e1b3189b5..b6b771ddc 100644
--- a/theme/dive_export.html
+++ b/theme/dive_export.html
@@ -164,20 +164,20 @@ function changeAdvSearch(e){
 	</div>
 	</center>
 		<div id="diveprofile">
-		<h2>Dive profile</h2>
+		<h2 class="det_hed">Dive profile</h2>
 		<canvas id="profileCanvas"></canvas>
 		</div>
 		<div id="diveinfo">
-		<h2>Dive Information</h2>
+		<h2 class="det_hed">Dive Information</h2>
 		</div>
 		<div id="dive_equipments">
-		<h2>Dive equipments</h2>
+		<h2 class="det_hed">Dive equipments</h2>
 		</div>
 		<div id="bookmarks">
-		<h2>Bookmarks</h2>
+		<h2 class="det_hed">Bookmarks</h2>
 		</div>
 		<div id="divestats">
-		<h2>Dive stats</h2>
+		<h2 class="det_hed">Dive stats</h2>
 		</div>
 	</div>
 </body>
diff --git a/theme/light.css b/theme/light.css
index 74aaa53cd..1dc5f6d10 100644
--- a/theme/light.css
+++ b/theme/light.css
@@ -40,6 +40,7 @@ th{
 .words{
 	font-size:inherit;
 	font-weight:bold;
+	padding-right:25px;
 }
 
 .item{
@@ -213,24 +214,9 @@ ul:hover{
 	padding-right:25px;
 }
 
-#diveinfo{
-	border-style:solid;
-}
-
-#diveprofile{
-	border-style:solid;
-}
-
-#dive_equipments{
-	border-style:solid;
-}
-
-#divestats{
-	border-style:solid;
-}
-
-#bookmarks{
-	border-style:solid;
+.det_hed{
+	background-color:#5f7f8f;
+	padding:3px;
 }
 
 @media (max-width: 768px) {
diff --git a/theme/list_lib.js b/theme/list_lib.js
index 882330a4c..fa595d8da 100644
--- a/theme/list_lib.js
+++ b/theme/list_lib.js
@@ -817,7 +817,7 @@ function get_cylinder_HTML(cylinder)
 function get_cylinders_HTML(dive)
 {
 	var result = "";
-	result += '<h2>Dive equipments</h2><table><tr><td class="Cyl">Type</td><td class="Cyl">Size</td><td class="Cyl">Work Pressure</td><td class="Cyl">Start Pressure</td><td class="Cyl">End Pressure</td><td class="Cyl">O2</td></tr>';
+	result += '<h2 class="det_hed">Dive equipments</h2><table><tr><td class="words">Type</td><td class="words">Size</td><td class="words">Work Pressure</td><td class="words">Start Pressure</td><td class="words">End Pressure</td><td class="words">O2</td></tr>';
 	for (var i in dive.Cylinders) {
 		result += get_cylinder_HTML(dive.Cylinders[i]);
 	}
@@ -853,7 +853,7 @@ function get_bookmarks_HTML(dive)
 */
 function get_dive_HTML(dive)
 {
-	return '<h2>Dive Information</h2><table><tr><td class="words">Date: </td><td>' + dive.date +
+	return '<h2 class="det_hed">Dive Information</h2><table><tr><td class="words">Date: </td><td>' + dive.date +
 	       '</td><td class="words">&nbsp&nbsp&nbsp&nbsp&nbspTime: </td><td>' + dive.time +
 	       '</td><td class="words">&nbsp&nbsp&nbsp&nbsp&nbspLocation: </td><td>' + '<a onclick=\"Search_list_Modules(\'' + dive.location + '\')\">' +
 	       dive.location + '</a>' +
diff --git a/theme/sand.css b/theme/sand.css
index a5bbe45b2..1ccde7762 100644
--- a/theme/sand.css
+++ b/theme/sand.css
@@ -40,6 +40,7 @@ th{
 .words{
 	font-size:inherit;
 	font-weight:bold;
+	padding-right:25px;
 }
 
 .item{
@@ -211,28 +212,9 @@ ul:hover{
 	box-shadow: 7px 7px 5px rgba(215, 107, 27, 0.43);
 }
 
-.Cyl{
-	padding-right:25px;
-}
-
-#diveinfo{
-	border-style:solid;
-}
-
-#diveprofile{
-	border-style:solid;
-}
-
-#dive_equipments{
-	border-style:solid;
-}
-
-#divestats{
-	border-style:solid;
-}
-
-#bookmarks{
-	border-style:solid;
+.det_hed{
+	background-color:#EFC15F;
+	padding:3px;
 }
 
 @media (max-width: 768px) {