diff -urN gthumb-2.6.3/data/albumthemes/BlueStripes/index.gthtml gthumb-new/data/albumthemes/BlueStripes/index.gthtml
--- gthumb-2.6.3/data/albumthemes/BlueStripes/index.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/BlueStripes/index.gthtml	2005-02-19 15:44:58.000000000 -0500
@@ -6,9 +6,9 @@
   <meta name="Generator" content="gThumb Image Viewer">
   <head>
     <gthumb:if pages > 1 />
-      <title><gthumb:header/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
+      <title><gthumb:header page="index"/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
     <gthumb:else/>
-      <title><gthumb:header/></title>
+      <title><gthumb:header page="index"/></title>
     <gthumb:end/>
     <style>
       a:link {
@@ -49,7 +49,7 @@
 
     <!-- Navigation Bar -->
     <p align="center">
-          <span class=title><gthumb:header/></span>     
+          <span class=title><gthumb:header page="index"/></span>     
     </p>
     <p align="right">
           <gthumb:if pages > 1 && page_idx > 1 />
@@ -81,7 +81,7 @@
     <center>
       <!-- <img src="white-dot.png" width="100%" height=2> -->
       <span class=copyright>
-         <gthumb:footer/>
+         <gthumb:footer page="index"/>
       </span>
     </center>
 
diff -urN gthumb-2.6.3/data/albumthemes/Classic/image.gthtml gthumb-new/data/albumthemes/Classic/image.gthtml
--- gthumb-2.6.3/data/albumthemes/Classic/image.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/Classic/image.gthtml	2005-02-19 16:07:38.000000000 -0500
@@ -106,7 +106,7 @@
 <gthumb:if file_name_visibility_image/>
 <tr>
   <td><span class="property"><gthumb:text>Image</gthumb:text></span></span></td>
-  <td><span class="property_value file_name"><gthumb:file_name/></span></td>
+  <td><span class="property_value file_name"><gthumb:file_name utf8/></span></td>
 </tr>
 <gthumb:end/>
 <gthumb:if image_dim_visibility_image/>
diff -urN gthumb-2.6.3/data/albumthemes/Classic/index.gthtml gthumb-new/data/albumthemes/Classic/index.gthtml
--- gthumb-2.6.3/data/albumthemes/Classic/index.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/Classic/index.gthtml	2005-02-19 15:45:53.000000000 -0500
@@ -4,9 +4,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<gthumb:language/>">
 <head>
 <gthumb:if pages > 1 />
-  <title><gthumb:header/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
+  <title><gthumb:header page="index"/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
 <gthumb:else/>
-  <title><gthumb:header/></title>
+  <title><gthumb:header page="index"/></title>
 <gthumb:end/>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="Generator" content="gThumb Image Viewer" />
@@ -25,7 +25,7 @@
 <table class="title">
 <tr>
   <td>
-  <span class="title"><gthumb:header/></span>
+  <span class="title"><gthumb:header page="index"/></span>
   </td>
 </tr>
 </table>
@@ -86,7 +86,7 @@
 <table class="full_size">
 <tr>
   <td>
-  <span class="copyright"><gthumb:footer/></span>
+  <span class="copyright"><gthumb:footer page="index"/></span>
   </td>
 </tr>
 </table>
diff -urN gthumb-2.6.3/data/albumthemes/Classic/thumbnail.gthtml gthumb-new/data/albumthemes/Classic/thumbnail.gthtml
--- gthumb-2.6.3/data/albumthemes/Classic/thumbnail.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/Classic/thumbnail.gthtml	2005-02-19 16:09:51.000000000 -0500
@@ -14,7 +14,7 @@
       </tr>
       </table>
 <gthumb:if file_name_visibility_index/>
-      <span class="property_value file_name"><gthumb:file_name/></span><br />
+      <span class="property_value file_name"><gthumb:file_name utf8/></span><br />
 <gthumb:end/>
 <gthumb:if image_dim_visibility_index/>
       <span class="property_value image_dim"><gthumb:image_dim/></span>
diff -urN gthumb-2.6.3/data/albumthemes/ClassicClips/index.gthtml gthumb-new/data/albumthemes/ClassicClips/index.gthtml
--- gthumb-2.6.3/data/albumthemes/ClassicClips/index.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/ClassicClips/index.gthtml	2005-02-19 15:46:34.000000000 -0500
@@ -4,9 +4,9 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<gthumb:language/>">
 <head>
 <gthumb:if pages > 1 />
-  <title><gthumb:header/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
+  <title><gthumb:header page="index"/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
 <gthumb:else/>
-  <title><gthumb:header/></title>
+  <title><gthumb:header page="index"/></title>
 <gthumb:end/>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="Generator" content="gThumb Image Viewer" />
@@ -25,7 +25,7 @@
 <table class="title">
 <tr>
   <td>
-  <span class="title"><gthumb:header/></span>
+  <span class="title"><gthumb:header page="index"/></span>
   </td>
 </tr>
 </table>
@@ -86,7 +86,7 @@
 <table class="full_size">
 <tr>
   <td>
-  <span class="copyright"><gthumb:footer/></span>
+  <span class="copyright"><gthumb:footer page="index"/></span>
   </td>
 </tr>
 </table>
diff -urN gthumb-2.6.3/data/albumthemes/ClassicClips/thumbnail.gthtml gthumb-new/data/albumthemes/ClassicClips/thumbnail.gthtml
--- gthumb-2.6.3/data/albumthemes/ClassicClips/thumbnail.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/ClassicClips/thumbnail.gthtml	2005-02-19 19:56:32.000000000 -0500
@@ -14,7 +14,7 @@
       </tr>
       </table>
 <gthumb:if file_name_visibility_index/>
-      <span class="property_value file_name"><gthumb:file_name/></span><br />
+      <span class="property_value file_name"><gthumb:file_name utf8/></span><br />
 <gthumb:end/>
 <gthumb:if image_dim_visibility_index/>
       <span class="property_value image_dim"><gthumb:image_dim/></span>
diff -urN gthumb-2.6.3/data/albumthemes/Clean/image.gthtml gthumb-new/data/albumthemes/Clean/image.gthtml
--- gthumb-2.6.3/data/albumthemes/Clean/image.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/Clean/image.gthtml	2005-02-19 16:06:43.000000000 -0500
@@ -106,7 +106,7 @@
 	    </td>
 	    <td width="100%">
       	      <font color="black">
-		 <tt><gthumb:file_name/></tt>
+		 <tt><gthumb:file_name utf8/></tt>
 	      </font>
 	    </td>
           </tr>
diff -urN gthumb-2.6.3/data/albumthemes/Clean/index.gthtml gthumb-new/data/albumthemes/Clean/index.gthtml
--- gthumb-2.6.3/data/albumthemes/Clean/index.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/Clean/index.gthtml	2005-02-19 15:02:10.000000000 -0500
@@ -6,9 +6,9 @@
   <meta name="Generator" content="gThumb Image Viewer">
   <head>
     <gthumb:if pages > 1 />
-      <title><gthumb:header/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
+      <title><gthumb:header page="index"/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
     <gthumb:else/>
-      <title><gthumb:header/></title>
+      <title><gthumb:header page="index"/></title>
     <gthumb:end/>
   <style>
     span.titolo { 
@@ -39,7 +39,7 @@
     <table align=center border=0  width="95%">
       <tr bgcolor="white">
         <td align=center colspan=2 width=88%>
-          &nbsp;<b><span class=titolo><gthumb:header/></span></b>
+          &nbsp;<b><span class=titolo><gthumb:header page="index"/></span></b>
         </td>
       </tr>
       <gthumb:if pages > 1 />
@@ -78,7 +78,7 @@
     <!-- Copyright -->
     <center>
       <span class=copyright>
-         <gthumb:footer/>
+         <gthumb:footer page="index"/>
       </span>
     </center>
 
diff -urN gthumb-2.6.3/data/albumthemes/NeatRound/index.gthtml gthumb-new/data/albumthemes/NeatRound/index.gthtml
--- gthumb-2.6.3/data/albumthemes/NeatRound/index.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/NeatRound/index.gthtml	2005-02-19 15:47:19.000000000 -0500
@@ -6,9 +6,9 @@
   <meta name="Generator" content="gThumb Image Viewer">
   <head>
     <gthumb:if pages > 1 />
-      <title><gthumb:header/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
+      <title><gthumb:header page="index"/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
     <gthumb:else/>
-      <title><gthumb:header/></title>
+      <title><gthumb:header page="index"/></title>
     <gthumb:end/>
     <style type="text/css">
         a:link { 
@@ -50,7 +50,7 @@
           <tr>
 	    <td colspan=4 align="center" width="100%">
 	      <font color="#555555" size=+2>
-	        <b><gthumb:header/></b>
+	        <b><gthumb:header page="index"/></b>
 	      </font>
 	    </td>
 	  </tr>
@@ -103,7 +103,7 @@
 	<table align=center border=0 cellspacing=0 width="100%">
 	  <tr>
 	    <td align="center">
-              <span class=copyright><gthumb:footer/></span></td></tr>
+              <span class=copyright><gthumb:footer page="index"/></span></td></tr>
 	</table>
 
     </table>
diff -urN gthumb-2.6.3/data/albumthemes/NeatRound/thumbnail.gthtml gthumb-new/data/albumthemes/NeatRound/thumbnail.gthtml
--- gthumb-2.6.3/data/albumthemes/NeatRound/thumbnail.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/NeatRound/thumbnail.gthtml	2005-02-19 19:57:08.000000000 -0500
@@ -20,7 +20,7 @@
 <div style="text-align: center">
   <gthumb:if file_name_visibility_index/>
     <font color="#969696">
-      <tt><gthumb:file_name/></tt> <br>
+      <tt><gthumb:file_name utf8/></tt> <br>
     </font>
   <gthumb:end/>
   <font color="#969696" size=-1>
diff -urN gthumb-2.6.3/data/albumthemes/NeatSquare/index.gthtml gthumb-new/data/albumthemes/NeatSquare/index.gthtml
--- gthumb-2.6.3/data/albumthemes/NeatSquare/index.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/NeatSquare/index.gthtml	2005-02-19 15:48:27.000000000 -0500
@@ -6,9 +6,9 @@
   <meta name="Generator" content="gThumb Image Viewer">
   <head>
     <gthumb:if pages > 1 />
-      <title><gthumb:header/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
+      <title><gthumb:header page="index"/> (<gthumb:page_idx/>/<gthumb:pages/>)</title>
     <gthumb:else/>
-      <title><gthumb:header/></title>
+      <title><gthumb:header page="index"/></title>
     <gthumb:end/>
     <style type="text/css">
         a:link { 
@@ -50,7 +50,7 @@
           <tr>
 	    <td colspan=4 align="center" width="100%">
 	      <font color="#555555" size=+2>
-	        <b><gthumb:header/></b>
+	        <b><gthumb:header page="index"/></b>
 	      </font>
 	    </td>
 	  </tr>
@@ -103,7 +103,7 @@
 	<table align=center border=0 cellspacing=0 width="100%">
 	  <tr>
 	    <td align="center">
-              <span class=copyright><gthumb:footer/></span></td></tr>
+              <span class=copyright><gthumb:footer page="index"/></span></td></tr>
 	</table>
   
     </table>
diff -urN gthumb-2.6.3/data/albumthemes/NeatSquare/thumbnail.gthtml gthumb-new/data/albumthemes/NeatSquare/thumbnail.gthtml
--- gthumb-2.6.3/data/albumthemes/NeatSquare/thumbnail.gthtml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/albumthemes/NeatSquare/thumbnail.gthtml	2005-02-19 19:57:30.000000000 -0500
@@ -20,7 +20,7 @@
 <div style="text-align: center">
   <gthumb:if file_name_visibility_index/>
     <font color="#969696">
-      <tt><gthumb:file_name/></tt> <br>
+      <tt><gthumb:file_name utf8/></tt> <br>
     </font>
   <gthumb:end/>
   <font color="#969696" size=-1>
diff -urN gthumb-2.6.3/data/glade/gthumb_web_exporter.glade gthumb-new/data/glade/gthumb_web_exporter.glade
--- gthumb-2.6.3/data/glade/gthumb_web_exporter.glade	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/data/glade/gthumb_web_exporter.glade	2005-02-19 15:25:27.000000000 -0500
@@ -515,7 +515,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="label123">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;&lt;b&gt;Note:&lt;/b&gt; %d (current date).&lt;/i&gt;&lt;/small&gt;</property>
+	      <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;&lt;b&gt;Note:&lt;/b&gt; %d=current date, %f=filename, %c=comment.&lt;/i&gt;&lt;/small&gt;</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
diff -urN gthumb-2.6.3/doc/C/gthumb.xml gthumb-new/doc/C/gthumb.xml
--- gthumb-2.6.3/doc/C/gthumb.xml	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/doc/C/gthumb.xml	2005-02-19 15:36:33.000000000 -0500
@@ -2168,6 +2168,15 @@
          <menuchoice><guimenu>Tools</guimenu><guimenuitem>Create Web Album
          </guimenuitem></menuchoice>.
        </para>
+       <para>
+Select a "theme" to control the look of the resulting web page.  
+In the "Header" and "Footer" lines you can enter text to be displayed on the web pages.  
+In the header and footer, %d will be replaced by the current date, 
+%f by the orignal filename of the image, and %c by any comment associated with the image.
+(Note: If you create your own custom themes, you can control where these headers and footers go
+by inserting gthumb:header and gthumb:footer tags.  Add page="index" in the themes for the index.html
+page to suppress filename and comments in the header and footer for that page.)   
+       </para>
     </sect2>
     <sect2 id="gthumb-photo">
       <title>To Import Photos from a Digital Camera</title>
diff -urN gthumb-2.6.3/README gthumb-new/README
--- gthumb-2.6.3/README	2005-01-22 09:08:30.000000000 -0500
+++ gthumb-new/README	2005-02-19 20:25:30.275733616 -0500
@@ -61,6 +61,7 @@
    + JPEG lossless transformations.
    + Find duplicated images.
    + Write images to CD/DVD.
+   + Create a web album (HTML).
 
  * gThumb is a Bonobo component
 
diff -urN gthumb-2.6.3/src/catalog-web-exporter.c gthumb-new/src/catalog-web-exporter.c
--- gthumb-2.6.3/src/catalog-web-exporter.c	2005-01-22 09:08:41.000000000 -0500
+++ gthumb-new/src/catalog-web-exporter.c	2005-02-19 20:21:44.310085616 -0500
@@ -28,6 +28,7 @@
 #include <time.h>
 #include <locale.h>
 #include <ctype.h>
+#include <libgen.h>
 #include <gtk/gtk.h>
 #include <libgnome/libgnome.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
@@ -984,7 +985,7 @@
 
 
 static char *
-get_hf_text (const char *utf8_text)
+get_hf_text (const char *utf8_text, const char *filename, const char *comment)
 {
 	const char *s;
 	GString    *r;
@@ -1021,9 +1022,20 @@
 				g_string_append (r, t);
 				g_free (t);
 				break;
+
+			case 'f':
+				/* Translate %f into filename */
+				if (filename) g_string_append (r, filename);
+				break;
+
+			case 'c':
+				/* Translate %c into comment */
+				if (comment) g_string_append (r, comment);
+				break;
 			}
-		} else
+		} else {
 			g_string_append_unichar (r, ch);
+		}
 	}
 
 	r_str = r->str;
@@ -1056,19 +1068,45 @@
 		const char *class;
 		char       *class_attr;
 		char       *filename;
+		char       *comment;
 		GList      *scan;
 
 
 		switch (tag->type) {
-		case GTH_TAG_HEADER:
-			line = get_hf_text (ce->header);
+		case GTH_TAG_HEADER: {
+			const char *page = gth_tag_get_str (ce, tag, "page");
+			/* If this is not the index.html page */
+			if (!page || strcmp (page, "index")) {
+				idx = get_image_idx (tag, ce);
+				idata = g_list_nth (ce->file_list, idx)->data;
+				filename = basename (idata->src_filename);
+				comment = idata->comment;
+			} else {
+				filename = "";
+				comment = "";
+			}
+			line = get_hf_text (ce->header, filename, comment);
 			write_line (line, fout);
 			break;
+		}
 
-		case GTH_TAG_FOOTER:
-			line = get_hf_text (ce->footer);
+		case GTH_TAG_FOOTER: {
+			const char *page = gth_tag_get_str (ce, tag, "page");
+			/* If this is not the index.html page */
+			if (!page || strcmp (page, "index")) {
+				/* This is not the index.html page */
+				idx = get_image_idx (tag, ce);
+				idata = g_list_nth (ce->file_list, idx)->data;
+				filename = basename (idata->src_filename );
+				comment = idata->comment;
+			} else {
+				filename = "";
+				comment = "";
+			}
+			line = get_hf_text (ce->footer, filename, comment);
 			write_line (line, fout);
 			break;
+		}
 
 		case GTH_TAG_LANGUAGE:
 			line = get_current_language ();
@@ -1159,20 +1197,26 @@
 		case GTH_TAG_FILENAME:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-			ce->eval_image = idata;
-
-			if (gth_tag_get_var (ce, tag, "with_path") != 0) {
-				line = get_image_filename (ce, idata, ce->location);
 
-			} else if (gth_tag_get_var (ce, tag, "with_relative_path") != 0) {
-				char *path = get_image_filename (ce, idata, ce->location);
-				line = get_path_relative_to_dir (path, ce->location);
-				g_free (path);
-
-			} else {
-				char *path = get_image_filename (ce, idata, ce->location);
+			if  (gth_tag_get_var (ce, tag, "src_name") != 0) {
+				char *path = idata->src_filename;
 				line = g_strdup (file_name_from_path (path));
-				g_free (path);
+			} else {
+ 
+				ce->eval_image = idata;
+				if (gth_tag_get_var (ce, tag, "with_path") != 0) {
+					line = get_image_filename (ce, idata, ce->location);
+	
+				} else if (gth_tag_get_var (ce, tag, "with_relative_path") != 0) {
+					char *path = get_image_filename (ce, idata, ce->location);
+					line = get_path_relative_to_dir (path, ce->location);
+					g_free (path);
+	
+				} else {
+					char *path = get_image_filename (ce, idata, ce->location);
+					line = g_strdup (file_name_from_path (path));
+					g_free (path);
+				}
 			}
 
 			if  (gth_tag_get_var (ce, tag, "utf8") != 0) 
@@ -1186,6 +1230,7 @@
 
 			break;
 
+
 		case GTH_TAG_FILEPATH:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
