diff --git a/ChangeLog b/ChangeLog
index 6c7bf808f..eb0452a83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2006-05-12  Don Allingham  <don@gramps-project.org>
 	* src/GrampsWidgets.py: fix MonitoredDataType initialization
+	* plugins/BookReport.py: append "file://" properly
 	
 2006-05-12  Alex Roitman  <shura@gramps-project.org>
 	* src/Filters/Makefile.am (pkgdata_PYTHON): Add new files.
diff --git a/data/gramps.schemas.in b/data/gramps.schemas.in
index 7929dfbad..998db7020 100644
--- a/data/gramps.schemas.in
+++ b/data/gramps.schemas.in
@@ -15,6 +15,42 @@
         </locale>
       </schema>
 
+      <schema>
+        <key>/schemas/apps/gramps/preferences/complete-color</key>
+        <applyto>/apps/gramps/preferences/complete-color</applyto>
+        <owner>gramps</owner>
+        <type>string</type>
+        <default>#FF0000</default>
+        <locale name="C">
+          <short>Color used to highlight compete items in a list</short>
+          <long>Color used to highlight compete items in a list</long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/apps/gramps/preferences/todo-color</key>
+        <applyto>/apps/gramps/preferences/todo-color</applyto>
+        <owner>gramps</owner>
+        <type>string</type>
+        <default>#FF0000</default>
+        <locale name="C">
+          <short>Color used to highlight TODO items in a list</short>
+          <long>Color used to highlight TODO items in a list</long>
+        </locale>
+      </schema>
+
+      <schema>
+        <key>/schemas/apps/gramps/preferences/custom-marker-color</key>
+        <applyto>/apps/gramps/preferences/custom-marker-color</applyto>
+        <owner>gramps</owner>
+        <type>string</type>
+        <default>#00FF00</default>
+        <locale name="C">
+          <short>Color used to highlight custom marker items in a list</short>
+          <long>Color used to highlight custom marker items in a list</long>
+        </locale>
+      </schema>
+
       <schema>
         <key>/schemas/apps/gramps/preferences/family-warn</key>
         <applyto>/apps/gramps/preferences/family-warn</applyto>
diff --git a/src/Config/_GrampsConfigKeys.py b/src/Config/_GrampsConfigKeys.py
index 4a6c85318..c49f17a44 100644
--- a/src/Config/_GrampsConfigKeys.py
+++ b/src/Config/_GrampsConfigKeys.py
@@ -1,4 +1,7 @@
 FAMILY_DETAILS       = ('preferences','family-details', 0)
+COMPLETE_COLOR       = ('preferences','complete-color', 2)
+TODO_COLOR           = ('preferences','todo-color', 2)
+CUSTOM_MARKER_COLOR  = ('preferences','custom-marker-color', 2)
 FAMILY_WARN          = ('preferences','family-warn', 0)
 HIDE_EP_MSG          = ('preferences','hide-ep-msg', 0)
 LAST_VIEW            = ('preferences','last-view', 1)
@@ -50,6 +53,9 @@ WEBSITE_DIRECTORY    = ('paths','website-directory', 2)
 
 default_value = {
     FAMILY_DETAILS       : True,
+    COMPLETE_COLOR       : '#FF0000',
+    TODO_COLOR           : '#FF0000',
+    CUSTOM_MARKER_COLOR  : '#00FF00',
     FAMILY_WARN          : True,
     HIDE_EP_MSG          : False,
     LAST_VIEW            : 0,
diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py
index 2e391e46a..506c06ef3 100644
--- a/src/plugins/BookReport.py
+++ b/src/plugins/BookReport.py
@@ -306,7 +306,7 @@ class BookList:
         """
 
         self.bookmap = {}
-        self.file = os.path.join('file:',const.home_dir,filename)
+        self.file = os.path.join(const.home_dir,filename)
         self.parse()
     
     def delete_book(self,name):
@@ -391,7 +391,7 @@ class BookList:
         try:
             p = make_parser()
             p.setContentHandler(BookParser(self))
-            p.parse(self.file)
+            p.parse("file://" + self.file)
         except (IOError,OSError,SAXParseException):
             pass