diff -ru gthumb-2.5.0/data/albumthemes/BlueStripes/image.gthtml gthumb-2.5.0-new/data/albumthemes/BlueStripes/image.gthtml
--- gthumb-2.5.0/data/albumthemes/BlueStripes/image.gthtml	2004-08-06 12:06:21.000000000 -0600
+++ gthumb-2.5.0-new/data/albumthemes/BlueStripes/image.gthtml	2004-08-15 18:36:22.926126401 -0600
@@ -42,6 +42,7 @@
       border-width: 2px;
     }
     td {
+      color: #EEEEEE;
       font-size: x-small;
     }
   </style>
diff -ru gthumb-2.5.0/data/albumthemes/Classic/image.gthtml gthumb-2.5.0-new/data/albumthemes/Classic/image.gthtml
--- gthumb-2.5.0/data/albumthemes/Classic/image.gthtml	2004-08-06 12:06:21.000000000 -0600
+++ gthumb-2.5.0-new/data/albumthemes/Classic/image.gthtml	2004-08-15 18:37:04.362915076 -0600
@@ -42,6 +42,7 @@
                 border-width: 2px;
         }
     	td {
+                color: white;
       		font-size: x-small;
     	}
     </style>
diff -ru gthumb-2.5.0/data/albumthemes/ClassicClips/image.gthtml gthumb-2.5.0-new/data/albumthemes/ClassicClips/image.gthtml
--- gthumb-2.5.0/data/albumthemes/ClassicClips/image.gthtml	2004-08-06 12:06:21.000000000 -0600
+++ gthumb-2.5.0-new/data/albumthemes/ClassicClips/image.gthtml	2004-08-15 18:37:32.610545452 -0600
@@ -42,6 +42,7 @@
                 border-width: 2px;
         }
     	td {
+                color: white;
       		font-size: x-small;
     	}
     </style>
diff -ru gthumb-2.5.0/data/albumthemes/Clean/image.gthtml gthumb-2.5.0-new/data/albumthemes/Clean/image.gthtml
--- gthumb-2.5.0/data/albumthemes/Clean/image.gthtml	2004-08-06 12:06:21.000000000 -0600
+++ gthumb-2.5.0-new/data/albumthemes/Clean/image.gthtml	2004-08-15 18:37:58.897895442 -0600
@@ -16,6 +16,7 @@
       text-align: center;
     }
     td {
+      color: black;
       font-size: x-small;
     }
     img {
diff -ru gthumb-2.5.0/data/albumthemes/NeatRound/image.gthtml gthumb-2.5.0-new/data/albumthemes/NeatRound/image.gthtml
--- gthumb-2.5.0/data/albumthemes/NeatRound/image.gthtml	2004-08-06 12:06:21.000000000 -0600
+++ gthumb-2.5.0-new/data/albumthemes/NeatRound/image.gthtml	2004-08-15 18:38:29.099808407 -0600
@@ -42,6 +42,7 @@
                 border-width: 2px;
         }
 	td {
+                color: black;
 		font-size: x-small;
 	}
     </style>
diff -ru gthumb-2.5.0/data/albumthemes/NeatSquare/image.gthtml gthumb-2.5.0-new/data/albumthemes/NeatSquare/image.gthtml
--- gthumb-2.5.0/data/albumthemes/NeatSquare/image.gthtml	2004-08-06 12:06:21.000000000 -0600
+++ gthumb-2.5.0-new/data/albumthemes/NeatSquare/image.gthtml	2004-08-15 18:38:47.232152076 -0600
@@ -42,6 +42,7 @@
                 border-width: 2px;
         }
 	td {
+                color: black;
 		font-size: x-small;
 	}
     </style>
Only in gthumb-2.5.0-new/doc/C: gthumb-C.omf.out
diff -ru gthumb-2.5.0/libgthumb/comments.c gthumb-2.5.0-new/libgthumb/comments.c
--- gthumb-2.5.0/libgthumb/comments.c	2004-08-06 12:06:22.000000000 -0600
+++ gthumb-2.5.0-new/libgthumb/comments.c	2004-08-15 17:34:44.530796650 -0600
@@ -771,8 +771,10 @@
 
 char *
 comments_get_comment_as_string (CommentData *data, 
+                                char        *head,
 				char        *sep1, 
-				char        *sep2)
+				char        *sep2,
+                                char        *tail)
 {
 	char      *as_string = NULL;
 	char       time_txt[50] = "";
@@ -802,6 +804,9 @@
 		GString *comment;
 
 		comment = g_string_new ("");
+                
+                if (head != NULL)
+                        g_string_append (comment, head);
 
 		if (data->comment != NULL) 
 			g_string_append (comment, data->comment);
@@ -818,6 +823,9 @@
 
 		if (utf8_time_txt != NULL) 
 			g_string_append (comment, utf8_time_txt);
+                
+                if (tail != NULL)
+                        g_string_append (comment, tail);
 
 		as_string = comment->str;
 		g_string_free (comment, FALSE);
diff -ru gthumb-2.5.0/libgthumb/comments.h gthumb-2.5.0-new/libgthumb/comments.h
--- gthumb-2.5.0/libgthumb/comments.h	2004-08-06 12:06:22.000000000 -0600
+++ gthumb-2.5.0-new/libgthumb/comments.h	2004-08-15 17:31:47.226884404 -0600
@@ -98,7 +98,9 @@
 						    CommentData *data);
 
 char *         comments_get_comment_as_string      (CommentData *data,
+                                                    char        *head,
 						    char        *sep1,
-						    char        *sep2);
+						    char        *sep2,
+                                                    char        *tail);
 
 #endif /* COMMENTS_H */
diff -ru gthumb-2.5.0/libgthumb/file-data.c gthumb-2.5.0-new/libgthumb/file-data.c
--- gthumb-2.5.0/libgthumb/file-data.c	2004-08-06 12:06:22.000000000 -0600
+++ gthumb-2.5.0-new/libgthumb/file-data.c	2004-08-15 17:45:08.168860917 -0600
@@ -124,7 +124,7 @@
 		return;
 	}
 
-	fd->comment = comments_get_comment_as_string (data, "\n", "\n");
+	fd->comment = comments_get_comment_as_string (data, NULL, "\n", "\n", NULL);
 	if (fd->comment == NULL)
 		fd->comment = g_strdup ("");
 
diff -ru gthumb-2.5.0/libgthumb/print-callbacks.c gthumb-2.5.0-new/libgthumb/print-callbacks.c
--- gthumb-2.5.0/libgthumb/print-callbacks.c	2004-08-06 12:06:22.000000000 -0600
+++ gthumb-2.5.0-new/libgthumb/print-callbacks.c	2004-08-15 17:45:41.678559603 -0600
@@ -1317,7 +1317,7 @@
 	}
 
 	if (cdata != NULL) {
-		pi->comment = comments_get_comment_as_string (cdata, "\n", " - ");
+		pi->comment = comments_get_comment_as_string (cdata, NULL, "\n", " - ", NULL);
 		comment_data_free (cdata);
 	}
 
@@ -3122,7 +3122,7 @@
 
 	cdata = comments_load_comment (image->filename);
 	if (cdata != NULL) {
-		image->comment = comments_get_comment_as_string (cdata, "\n", " - ");
+		image->comment = comments_get_comment_as_string (cdata, NULL, "\n", " - ", NULL);
 		comment_data_free (cdata);
 	}
 
diff -ru gthumb-2.5.0/src/catalog-png-exporter.c gthumb-2.5.0-new/src/catalog-png-exporter.c
--- gthumb-2.5.0/src/catalog-png-exporter.c	2004-08-06 12:06:31.000000000 -0600
+++ gthumb-2.5.0-new/src/catalog-png-exporter.c	2004-08-15 17:37:38.205041336 -0600
@@ -129,7 +129,7 @@
 	idata = g_new (ImageData, 1);
 
 	cdata = comments_load_comment (filename);
-	idata->comment = comments_get_comment_as_string (cdata, "\n", "\n");
+	idata->comment = comments_get_comment_as_string (cdata, NULL, "\n", "\n", NULL);
 	if (cdata != NULL)
 		comment_data_free (cdata);
 
diff -ru gthumb-2.5.0/src/catalog-web-exporter.c gthumb-2.5.0-new/src/catalog-web-exporter.c
--- gthumb-2.5.0/src/catalog-web-exporter.c	2004-08-06 12:06:31.000000000 -0600
+++ gthumb-2.5.0-new/src/catalog-web-exporter.c	2004-08-15 18:23:24.114026075 -0600
@@ -109,6 +109,10 @@
 static int img_counter = 0;
 
 
+#define COMMENT_TABLE_HEAD "<table border=\"0\" align=\"left\">\n<tr>\n<td>\n"
+#define COMMENT_TABLE_SEP  "</td>\n</tr>\n<tr>\n<td>\n"
+#define COMMENT_TABLE_TAIL "</td>\n</tr>\n</table>\n"
+
 static ImageData *
 image_data_new (const char *filename)
 {
@@ -118,7 +122,7 @@
 	idata = g_new (ImageData, 1);
 
 	cdata = comments_load_comment (filename);
-	idata->comment = comments_get_comment_as_string (cdata, "&nbsp;<BR>", "&nbsp;<BR>");
+	idata->comment = comments_get_comment_as_string (cdata, COMMENT_TABLE_HEAD, COMMENT_TABLE_SEP, COMMENT_TABLE_SEP, COMMENT_TABLE_TAIL);
 	if (cdata != NULL)
 		comment_data_free (cdata);
 
diff -ru gthumb-2.5.0/src/dlg-image-prop.c gthumb-2.5.0-new/src/dlg-image-prop.c
--- gthumb-2.5.0/src/dlg-image-prop.c	2004-08-06 12:06:31.000000000 -0600
+++ gthumb-2.5.0-new/src/dlg-image-prop.c	2004-08-15 17:36:57.308054502 -0600
@@ -300,7 +300,7 @@
                 return;
 	}
 
-	comment = comments_get_comment_as_string (cdata, "\n", " - ");
+	comment = comments_get_comment_as_string (cdata, NULL, "\n", " - ", NULL);
 
 	if (comment != NULL) {
 		GtkTextIter iter;
diff -ru gthumb-2.5.0/src/fullscreen.c gthumb-2.5.0-new/src/fullscreen.c
--- gthumb-2.5.0/src/fullscreen.c	2004-08-06 12:06:31.000000000 -0600
+++ gthumb-2.5.0-new/src/fullscreen.c	2004-08-15 17:36:27.864863013 -0600
@@ -292,7 +292,7 @@
 	
 	comment = NULL;
 	if (cdata != NULL) {
-		comment = comments_get_comment_as_string (cdata, "\n", " - ");
+		comment = comments_get_comment_as_string (cdata, NULL, "\n", " - ", NULL);
 		comment_data_free (cdata);
 	}
 
diff -ru gthumb-2.5.0/src/gthumb-window.c gthumb-2.5.0-new/src/gthumb-window.c
--- gthumb-2.5.0/src/gthumb-window.c	2004-08-06 12:06:31.000000000 -0600
+++ gthumb-2.5.0-new/src/gthumb-window.c	2004-08-15 17:36:03.157932855 -0600
@@ -327,7 +327,7 @@
 		return;
 	}
 
-	comment = comments_get_comment_as_string (cdata, "\n\n", " - ");
+	comment = comments_get_comment_as_string (cdata, NULL, "\n\n", " - ", NULL);
 
 	if (comment != NULL) {
 		GtkTextIter iter;
