diff --git a/lib/WebGUI/Template.pm b/lib/WebGUI/Template.pm
index 46f6fc187..387e0323d 100644
--- a/lib/WebGUI/Template.pm
+++ b/lib/WebGUI/Template.pm
@@ -103,13 +103,13 @@ sub selectTemplate {
 		$templates{$key} =~ s/\n//g;
 		$templates{$key} =~ s/\r//g;
 		$templates{$key} =~ s/\'/\\\'/g;
-		$templates{$key} =~ s/\<table.*?\>/\<table\ border\=1>/ig;
+		$templates{$key} =~ s/\<table.*?\>/\<table cellspacing=0 cellpadding=3 width=60 height=80 border=1\>/ig;
 		$templates{$key} =~ s/\^(\d+)\;/$1/g;
 		$output .= "	var b".$key." = '".$templates{$key}."';\n";
 	}
 	$output .= '</script>';
 	$output .= $f->printRowsOnly;
-	$output .= '<div id="templatePreview"></div>';
+	$output .= '<div id="templatePreview" style="padding: 5px;"></div>';
 	return $output;
 }
 
diff --git a/www/extras/templates/Default.gif b/www/extras/templates/Default.gif
deleted file mode 100644
index 1bf964efd..000000000
Binary files a/www/extras/templates/Default.gif and /dev/null differ
diff --git a/www/extras/templates/LeftColumn.gif b/www/extras/templates/LeftColumn.gif
deleted file mode 100644
index d82f5cdab..000000000
Binary files a/www/extras/templates/LeftColumn.gif and /dev/null differ
diff --git a/www/extras/templates/News.gif b/www/extras/templates/News.gif
deleted file mode 100644
index e65c0bc8f..000000000
Binary files a/www/extras/templates/News.gif and /dev/null differ
diff --git a/www/extras/templates/OneOverThree.gif b/www/extras/templates/OneOverThree.gif
deleted file mode 100644
index d4091045d..000000000
Binary files a/www/extras/templates/OneOverThree.gif and /dev/null differ
diff --git a/www/extras/templates/RightColumn.gif b/www/extras/templates/RightColumn.gif
deleted file mode 100644
index 1756be146..000000000
Binary files a/www/extras/templates/RightColumn.gif and /dev/null differ
diff --git a/www/extras/templates/SideBySide.gif b/www/extras/templates/SideBySide.gif
deleted file mode 100644
index e14289320..000000000
Binary files a/www/extras/templates/SideBySide.gif and /dev/null differ
diff --git a/www/extras/templates/ThreeOverOne.gif b/www/extras/templates/ThreeOverOne.gif
deleted file mode 100644
index a12a48657..000000000
Binary files a/www/extras/templates/ThreeOverOne.gif and /dev/null differ