diff --git a/Makefile.am b/Makefile.am
index 6b594a0..5b0d543 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess \
 		       ltconfig ltmain.sh missing mkinstalldirs \
 		       stamp-h.in
 
-SUBDIRS		     = libltdl loaders src filters
+SUBDIRS		     = libltdl loaders src filters dox
 
 EXTRA_DIST = \
 imlib2.spec \
diff --git a/configure.in b/configure.in
index c776058..fe79173 100644
--- a/configure.in
+++ b/configure.in
@@ -117,5 +117,5 @@ AC_MSG_ERROR([Fatal Error: no FreeType header files detected.])
 fi
 fi
 
-AC_OUTPUT(Makefile loaders/Makefile src/Makefile test/Makefile filters/Makefile demo/Makefile,
+AC_OUTPUT(Makefile loaders/Makefile src/Makefile test/Makefile filters/Makefile demo/Makefile dox/Makefile,
 [test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h])
diff --git a/dox/.cvsignore b/dox/.cvsignore
new file mode 100644
index 0000000..dfbef89
--- /dev/null
+++ b/dox/.cvsignore
@@ -0,0 +1,20 @@
+config.guess
+config.h.in
+config.sub
+ltconfig
+ltmain.sh
+aclocal.m4
+stamp-h.in
+Makefile.in
+configure
+config.log
+config.h
+config.cache
+libtool
+config.status
+stamp-h
+Makefile
+.deps
+.libs
+*.lo
+*.la
diff --git a/dox/Makefile.am b/dox/Makefile.am
new file mode 100644
index 0000000..9f7ead7
--- /dev/null
+++ b/dox/Makefile.am
@@ -0,0 +1,14 @@
+# A list of all the files in the current directory which can be regenerated
+MAINTAINERCLEANFILES = Makefile.in				
+
+LDFLAGS           = -L/usr/X11R6/lib
+INCLUDES          = -I/usr/X11R6/include \
+                    $(X_CFLAGS) -I$(prefix)/include -I$(includedir) -I. \
+                    -DPREFIX=\""$(prefix)"\"
+LIBOBJS = @LIBOBJS@
+
+bin_PROGRAMS      = bdox
+bdox_SOURCES      = main.c dox.h hotspot.c
+bdox_LDADD        = -lX11
+
+EXTRA_DIST = 
diff --git a/dox/dox.h b/dox/dox.h
new file mode 100644
index 0000000..f8ee615
--- /dev/null
+++ b/dox/dox.h
@@ -0,0 +1,46 @@
+#ifndef _DOX_H_
+#define _DOX_H_
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#include <X11/Xos.h>
+#include <X11/keysym.h>
+#include <X11/Xresource.h>
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <dirent.h>
+#include <stdarg.h>
+#include <sys/wait.h>
+#include <Imlib2.h>
+
+typedef struct __dox_hotspot
+{
+   char *name;
+   int x;
+   int y;
+   int w;
+   int h;
+   struct __dox_hotspot *next;
+} DoxHotspot;
+
+void  parse_args( int argc, char **argv );
+
+void  init_hotspot();
+void  add_hotspot( char *target, int x, int y, int w, int h );
+char *check_hotspot( int x, int y );
+void  tidy_hotspots();
+
+void  load_dox( char *file );
+void  parse_dox( char *file );
+
+void  load_dss( char *file );
+
+
+#endif /* _DOX_H_ */
diff --git a/dox/hotspot.c b/dox/hotspot.c
new file mode 100644
index 0000000..b7c7897
--- /dev/null
+++ b/dox/hotspot.c
@@ -0,0 +1,51 @@
+#include "dox.h"
+
+DoxHotspot *root;
+
+void  init_hotspot()
+{
+   root = malloc( sizeof( DoxHotspot ) );
+   root->name = strdup( "root" );
+   root->x = 0;
+   root->y = 0;
+   root->w = 0;
+   root->h = 0;
+   root->next = NULL;
+   printf( "Hotspots initialised.\n" );
+}
+
+void  add_hotspot( char *target, int x, int y, int w, int h )
+{
+   DoxHotspot *ptr;
+   for( ptr = root; ptr->next != NULL; ptr = ptr->next )
+     ;
+   ptr->next = malloc( sizeof( DoxHotspot ) );
+   ptr = ptr->next;
+   ptr->name = strdup( "root" );
+   ptr->x = 0;
+   ptr->y = 0;
+   ptr->w = 0;
+   ptr->h = 0;
+   ptr->next = NULL;
+   printf( "Hotspot added\n" );
+}
+
+char *check_hotspot( int x, int y )
+{  
+   DoxHotspot *ptr;
+   for( ptr = root; ptr != NULL; ptr = ptr->next )
+   {
+      if( (x >= ptr->x) && (x <= (ptr->x + ptr->w)) &&
+	  (y >= ptr->y) && (y <= (ptr->y + ptr->h)) )
+      {
+	 printf( "Found Hotspot\n" );
+	 return ptr->name;
+      }
+   }
+   return NULL;
+}
+
+void  tidy_hotspots()
+{
+   
+}
diff --git a/dox/main.c b/dox/main.c
new file mode 100644
index 0000000..4c6686a
--- /dev/null
+++ b/dox/main.c
@@ -0,0 +1,8 @@
+#include <stdio.h>
+
+int main( int argc, char **argv )
+{
+   printf( "dox - version 2.0 - Imlib2\n" );
+   init_hotspot();
+   return 0;
+}
diff --git a/dox/style.dss b/dox/style.dss
new file mode 100644
index 0000000..a53346f
--- /dev/null
+++ b/dox/style.dss
@@ -0,0 +1,16 @@
+<style
+
+  title.font = "brooklyn.ttf",
+  title.size = 35,
+  
+  link.normal.colour = "#aaaaff",
+  link.normal.font = "brooklyn.ttf",
+  link.normal.size = 26,
+  
+  link.visited.colour = "#ffaaaa",
+  link.visited.font = "brooklyn.ttf",
+  link.visited.size = 26,
+  
+  bg.picture = "bg.png",
+  
+/>
diff --git a/filters/filter_bumpmap.c b/filters/filter_bumpmap.c
index bbc16b8..c29123a 100644
--- a/filters/filter_bumpmap.c
+++ b/filters/filter_bumpmap.c
@@ -231,13 +231,17 @@ bump_map_point(Imlib_Image im, pIFunctionParam par)
 void
 init(struct imlib_filter_info *info)
 {
-	char *filters[] = { "bump_map_point", "bump_map" };
-	int i = (sizeof(filters) / sizeof(*filters));
-	info->num_filters = i;
-	info->filters = malloc(sizeof(char *) * i);
-	while (--i >= 0)
-		info->filters[i] = strdup(filters[i]);
-
+   char *filters[] = { "bump_map_point", "bump_map" };
+   int i = (sizeof(filters) / sizeof(*filters));
+   
+   info->name = strdup( "Bump Mapping" );
+   info->author = strdup( "Willem Monsuwe (willem@stack.nl)" );
+   info->description = strdup( "Provides bumpmapping to a point and bumpmapping from an infinite light source. *very* cool." );
+   info->num_filters = i;
+   info->filters = malloc(sizeof(char *) * i);
+   while (--i >= 0)
+     info->filters[i] = strdup(filters[i]);
+   
 }
 
 void
diff --git a/filters/filter_test.c b/filters/filter_test.c
index 22f6971..04e11b1 100644
--- a/filters/filter_test.c
+++ b/filters/filter_test.c
@@ -18,10 +18,13 @@ void  *exec( char *filter, void *im, pIFunctionParam params );
 
 void init( struct imlib_filter_info *info )
 {
-   char *filters[] = { "tint", "cool_text" };
+   char *filters[] = { "tint", "cool_text", "gradient" };
    int i = 0;
-   
-   info->num_filters = 2;
+
+   info->name = strdup( "Test Filter" );
+   info->author = strdup( "Chris Ross - Boris - chris@darkrock.co.uk" );
+   info->description = strdup( "This filter is used to show that the imlib2 filter system works!" );
+   info->num_filters = 3;
    info->filters = malloc(sizeof(char *)*2);
    for (i = 0; i < info->num_filters; i++)
       info->filters[i] = strdup(filters[i]);
@@ -89,7 +92,6 @@ void *exec( char *filter, void *im, pIFunctionParam params )
       imlib_free_image_and_decache();
       imlib_context_set_image(imge);
   
-
       return imge;
    }
    
@@ -97,4 +99,13 @@ void *exec( char *filter, void *im, pIFunctionParam params )
    {
       return imge;
    }  
+   if( strcmp( filter, "gradient" ) == 0 )
+   {
+      int angle = 0;
+      for( ptr = params; ptr != NULL; ptr = ptr->next )
+      {
+	 ASSIGN_INT( "angle", angle );
+      }
+      return imge;
+   }  
 }
diff --git a/src/dynamic_filters.c b/src/dynamic_filters.c
index 8700791..98bcb1a 100644
--- a/src/dynamic_filters.c
+++ b/src/dynamic_filters.c
@@ -62,7 +62,10 @@ pImlibExternalFilter __imlib_LoadFilter( char *file )
    ptr->init_filter( info );
    ptr->num_filters = info->num_filters;
    ptr->filters = info->filters;
-
+   ptr->name = info->name;
+   ptr->author = info->author;
+   ptr->description = info->description;
+   
    free( info );
    
 #ifdef FDEBUG   
diff --git a/src/dynamic_filters.h b/src/dynamic_filters.h
index f34a671..93eae42 100644
--- a/src/dynamic_filters.h
+++ b/src/dynamic_filters.h
@@ -5,6 +5,9 @@
 
 struct imlib_filter_info
 {
+   char *name;
+   char *author;
+   char *description;
    char **filters;
    int num_filters;
 };
@@ -13,6 +16,9 @@ typedef struct _imlib_external_filter ImlibExternalFilter;
 typedef struct _imlib_external_filter *pImlibExternalFilter;
 struct _imlib_external_filter
 {
+   char *name;
+   char *author;
+   char *description;
    int    num_filters;
    char  *filename;
    void  *handle;