diff --git a/classes/report_types/PhpReportType.php b/classes/report_types/PhpReportType.php
index aefdd257..655c6cfe 100644
--- a/classes/report_types/PhpReportType.php
+++ b/classes/report_types/PhpReportType.php
@@ -38,10 +38,10 @@ public static function run(&$report) {
 		
 		$parts = preg_split('/<\?php \/\*(BEGIN|END) (INCLUDED REPORT|REPORT MACROS)\*\/ \?>/',$eval);
 		$formatted = '';
-		$code = '<div style="margin: 10px 0;">'.htmlentities(array_pop($parts)).'</div>';
+		$code = '<div style="margin: 10px 0;">'.highlight_string(array_pop($parts),true).'</div>';
 		foreach($parts as $part) {
 			if(!trim($part)) continue;
-			$formatted .= "<div class='included_report'>".htmlentities($part)."</div>";
+			$formatted .= "<div class='included_report'>".highlight_string($part, true)."</div>";
 		}
 		$formatted .= $code;
 		
diff --git a/templates/html/report.mustache b/templates/html/report.mustache
index 6859ec22..268989ee 100644
--- a/templates/html/report.mustache
+++ b/templates/html/report.mustache
@@ -179,7 +179,7 @@ $('.show_query').click(function() {
 });
 $('.included_report').each(function() {
 	var self = $(this);
-	self.css('display','none').css('background-color','#ddd');
+	self.css('display','none').css('background-color','#f4f4f4').css('padding-left','10px');
 	var link = $('<a>').attr('href','#').text('View Included Report').css('display','block').click(function() {
 		self.toggle(200);
 		return false;