diff --git a/src/Makefile.am b/src/Makefile.am
index 61addbca1..49db9bae4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,6 @@ SUBDIRS = \
 gdirdir=$(prefix)/share/gramps
 
 gdir_PYTHON = \
-	config.py\
 	const.py\
         constfunc.py\
 	gramps.py\
diff --git a/src/Utils.py b/src/Utils.py
index f09c84a12..b89c88900 100644
--- a/src/Utils.py
+++ b/src/Utils.py
@@ -63,7 +63,7 @@ from gen.ggettext import sgettext as _
 #-------------------------------------------------------------------------
 # cache values; use refresh_constants() if they change
 try:
-    import config
+    from gen.config import config
     _MAX_AGE_PROB_ALIVE   = config.get('behavior.max-age-prob-alive')
     _MAX_SIB_AGE_DIFF     = config.get('behavior.max-sib-age-diff')
     _AVG_GENERATION_GAP   = config.get('behavior.avg-generation-gap')
@@ -1357,7 +1357,7 @@ def update_constants():
     """
     Used to update the constants that are cached in this module.
     """
-    import config
+    from gen.config import config
     global _MAX_AGE_PROB_ALIVE, _MAX_SIB_AGE_DIFF, _AVG_GENERATION_GAP
     _MAX_AGE_PROB_ALIVE   = config.get('behavior.max-age-prob-alive')
     _MAX_SIB_AGE_DIFF     = config.get('behavior.max-sib-age-diff')
diff --git a/src/cli/argparser.py b/src/cli/argparser.py
index 647da9fc9..c084133ed 100644
--- a/src/cli/argparser.py
+++ b/src/cli/argparser.py
@@ -47,7 +47,7 @@ import logging
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gen.utils.configmanager import safe_eval
 import Utils
 
diff --git a/src/cli/clidbman.py b/src/cli/clidbman.py
index 5d154303d..e112cbed0 100644
--- a/src/cli/clidbman.py
+++ b/src/cli/clidbman.py
@@ -54,7 +54,7 @@ LOG = logging.getLogger(".clidbman")
 #-------------------------------------------------------------------------
 import gen.db
 from gen.plug import BasePluginManager
-import config
+from gen.config import config
 import constfunc
 #-------------------------------------------------------------------------
 #
diff --git a/src/cli/grampscli.py b/src/cli/grampscli.py
index 2e8865375..0a7a9fc73 100644
--- a/src/cli/grampscli.py
+++ b/src/cli/grampscli.py
@@ -46,7 +46,7 @@ LOG = logging.getLogger(".grampscli")
 #
 #-------------------------------------------------------------------------
 from gen.display.name import displayer as name_displayer
-import config
+from gen.config import config
 import const
 from gen.errors import DbError
 from gen.dbstate import DbState
diff --git a/src/gen/Makefile.am b/src/gen/Makefile.am
index 313df1fb8..5cd586135 100644
--- a/src/gen/Makefile.am
+++ b/src/gen/Makefile.am
@@ -22,6 +22,7 @@ pkgpythondir = $(datadir)/@PACKAGE@/gen
 
 pkgpython_PYTHON = \
 	__init__.py \
+	config.py \
 	dbstate.py \
 	errors.py \
 	ggettext.py \
diff --git a/src/config.py b/src/gen/config.py
similarity index 100%
rename from src/config.py
rename to src/gen/config.py
diff --git a/src/gen/datehandler/__init__.py b/src/gen/datehandler/__init__.py
index 7d09d543d..8cafe45ae 100644
--- a/src/gen/datehandler/__init__.py
+++ b/src/gen/datehandler/__init__.py
@@ -62,7 +62,7 @@ except:
 
 # Initialize global displayer
 try:
-    import config
+    from gen.config import config
     val = config.get('preferences.date-format')
 except:
     val = 0
diff --git a/src/gen/db/bsddbtxn.py b/src/gen/db/bsddbtxn.py
index 114da01fd..bc8383f34 100644
--- a/src/gen/db/bsddbtxn.py
+++ b/src/gen/db/bsddbtxn.py
@@ -188,7 +188,7 @@ class BSDDBTxn(object):
 # test code
 if __name__ == "__main__": 
     print "1"
-    import config
+    from gen.config import config
     if config.get('preferences.use-bsddb3'):
         from bsddb3 import db, dbshelve
     else:
diff --git a/src/gen/db/cursor.py b/src/gen/db/cursor.py
index 70ae30c9d..babe2e59d 100644
--- a/src/gen/db/cursor.py
+++ b/src/gen/db/cursor.py
@@ -28,7 +28,7 @@
 #-------------------------------------------------------------------------
 from cPickle import dumps, loads
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:
diff --git a/src/gen/db/dbconst.py b/src/gen/db/dbconst.py
index 8694ac8d8..d792f176f 100644
--- a/src/gen/db/dbconst.py
+++ b/src/gen/db/dbconst.py
@@ -66,7 +66,7 @@ DBLOCKS   = 100000          # Maximum number of locks supported
 DBOBJECTS = 100000          # Maximum number of simultaneously locked objects
 DBUNDO    = 1000            # Maximum size of undo buffer
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3.db import DB_CREATE, DB_AUTO_COMMIT, DB_DUP, DB_DUPSORT, DB_RDONLY
 else:
diff --git a/src/gen/db/read.py b/src/gen/db/read.py
index 22a7fce71..246762201 100644
--- a/src/gen/db/read.py
+++ b/src/gen/db/read.py
@@ -38,7 +38,7 @@ import locale
 import os
 from sys import maxint
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:
diff --git a/src/gen/db/undoredo.py b/src/gen/db/undoredo.py
index 9f5cb0aec..2513e7283 100644
--- a/src/gen/db/undoredo.py
+++ b/src/gen/db/undoredo.py
@@ -36,7 +36,7 @@ import time, os
 import cPickle as pickle
 from collections import deque
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:
diff --git a/src/gen/db/upgrade.py b/src/gen/db/upgrade.py
index e56e650e5..bf57a0df4 100644
--- a/src/gen/db/upgrade.py
+++ b/src/gen/db/upgrade.py
@@ -34,7 +34,7 @@ from gen.ggettext import gettext as _
 """
 methods to upgrade a database from version 13 to current version
 """
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:
diff --git a/src/gen/db/write.py b/src/gen/db/write.py
index 00299c6bf..5b7af2791 100644
--- a/src/gen/db/write.py
+++ b/src/gen/db/write.py
@@ -43,7 +43,7 @@ import logging
 from sys import maxint
 
 from gen.ggettext import gettext as _
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import dbshelve, db
 else:
diff --git a/src/gen/dbstate.py b/src/gen/dbstate.py
index df08f8b75..c3fb4f0f1 100644
--- a/src/gen/dbstate.py
+++ b/src/gen/dbstate.py
@@ -28,7 +28,7 @@ Provide the database state class
 from gen.db import DbBsddbRead
 from gen.proxy.proxybase import ProxyDbBase
 from gen.utils import Callback
-import config
+from gen.config import config
 
 class DbState(Callback):
     """
diff --git a/src/gen/display/name.py b/src/gen/display/name.py
index 7af033369..0299aeaa0 100644
--- a/src/gen/display/name.py
+++ b/src/gen/display/name.py
@@ -64,7 +64,7 @@ import re
 from gen.lib import Name, NameOriginType
 
 try:
-    import config
+    from gen.config import config
     WITH_GRAMPS_CONFIG=True
 except ImportError:
     WITH_GRAMPS_CONFIG=False
diff --git a/src/gen/lib/date.py b/src/gen/lib/date.py
index 3b594f836..27c4f3c4c 100644
--- a/src/gen/lib/date.py
+++ b/src/gen/lib/date.py
@@ -57,7 +57,7 @@ from gen.lib.calendar import (gregorian_sdn, julian_sdn, hebrew_sdn,
                               gregorian_ymd, julian_ymd, hebrew_ymd, 
                               french_ymd, persian_ymd, islamic_ymd,
                               swedish_ymd)
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gen/lib/familyreltype.py b/src/gen/lib/familyreltype.py
index 6b7cab3b5..aa962afcb 100644
--- a/src/gen/lib/familyreltype.py
+++ b/src/gen/lib/familyreltype.py
@@ -35,7 +35,7 @@ from gen.ggettext import gettext as _
 #
 #-------------------------------------------------------------------------
 from gen.lib.grampstype import GrampsType
-import config
+from gen.config import config
 
 class FamilyRelType(GrampsType):
 
diff --git a/src/gen/lib/test/date_test.py b/src/gen/lib/test/date_test.py
index 7a1e3abf7..44a80200a 100644
--- a/src/gen/lib/test/date_test.py
+++ b/src/gen/lib/test/date_test.py
@@ -45,7 +45,7 @@ except ValueError:
 from test import test_util
 test_util.path_append_parent() 
 
-import config
+from gen.config import config
 import gen.datehandler
 from gen.datehandler import parser as _dp
 from gen.datehandler import displayer as _dd
diff --git a/src/gen/plug/_gramplet.py b/src/gen/plug/_gramplet.py
index 8db648421..95d4fe577 100644
--- a/src/gen/plug/_gramplet.py
+++ b/src/gen/plug/_gramplet.py
@@ -21,7 +21,7 @@
 
 # $Id$
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     import bsddb3 as bsddb
 else:
diff --git a/src/gen/plug/_manager.py b/src/gen/plug/_manager.py
index b3f35fbc3..5138ae4c3 100644
--- a/src/gen/plug/_manager.py
+++ b/src/gen/plug/_manager.py
@@ -45,7 +45,7 @@ from gen.ggettext import gettext as _
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import gen.utils
 from gen.plug import PluginRegister
 
diff --git a/src/gen/plug/report/_options.py b/src/gen/plug/report/_options.py
index 80b519b1f..7f1fc9e1c 100644
--- a/src/gen/plug/report/_options.py
+++ b/src/gen/plug/report/_options.py
@@ -58,7 +58,7 @@ except:
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gen.plug.docgen import PAPER_PORTRAIT
 from gen.plug import _options
 from gen.plug import MenuOptions
diff --git a/src/gen/proxy/living.py b/src/gen/proxy/living.py
index b52e11a97..25eedb85f 100644
--- a/src/gen/proxy/living.py
+++ b/src/gen/proxy/living.py
@@ -39,7 +39,7 @@ from itertools import ifilter
 from proxybase import ProxyDbBase
 from gen.lib import Date, Person, Name, Surname
 from Utils import probably_alive
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gen/relationship.py b/src/gen/relationship.py
index 95ef6d10f..b322a6e69 100644
--- a/src/gen/relationship.py
+++ b/src/gen/relationship.py
@@ -401,7 +401,7 @@ class RelationshipCalculator(object):
         self.__db_connected = False
         self.depth = 15
         try:
-            import config
+            from gen.config import config
             self.set_depth(config.get('behavior.generation-depth'))
         except ImportError:
             pass
diff --git a/src/gen/simple/_simpleaccess.py b/src/gen/simple/_simpleaccess.py
index 48e571bde..80a3d03c5 100644
--- a/src/gen/simple/_simpleaccess.py
+++ b/src/gen/simple/_simpleaccess.py
@@ -36,7 +36,7 @@ from gen.plug.report.utils import place_name
 
 from gen.display.name import displayer as name_displayer
 from gen.lib import EventType
-import config
+from gen.config import config
 from gen.ggettext import gettext as _
 
 #-------------------------------------------------------------------------
diff --git a/src/gen/simple/_simpletable.py b/src/gen/simple/_simpletable.py
index 19d68bcc1..50147ae4c 100644
--- a/src/gen/simple/_simpletable.py
+++ b/src/gen/simple/_simpletable.py
@@ -29,7 +29,7 @@ Provide a simplified table creation interface
 import cgi
 from gen.ggettext import sgettext as _
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 
 class SimpleTable(object):
diff --git a/src/gramps.py b/src/gramps.py
index d5dffce5d..8e6dc392f 100644
--- a/src/gramps.py
+++ b/src/gramps.py
@@ -251,7 +251,7 @@ def show_settings():
     except ImportError:
         pyexiv2_str = 'not found'
 
-    import config
+    from gen.config import config
     usebsddb3 = config.get('preferences.use-bsddb3')
     try:
         if usebsddb3:
diff --git a/src/gui/aboutdialog.py b/src/gui/aboutdialog.py
index b7abe9d75..0cdc0caff 100644
--- a/src/gui/aboutdialog.py
+++ b/src/gui/aboutdialog.py
@@ -53,7 +53,7 @@ import gtk
 #-------------------------------------------------------------------------
 import const
 from gui.display import display_url
-import config
+from gen.config import config
 
 if config.get('preferences.use-bsddb3'):
     import bsddb3 as bsddb
diff --git a/src/gui/clipboard.py b/src/gui/clipboard.py
index bd6cf74bb..013948295 100644
--- a/src/gui/clipboard.py
+++ b/src/gui/clipboard.py
@@ -45,7 +45,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK, ACTION_MOVE
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 import gen.lib
 import gen.datehandler
 from gui.display import display_help
diff --git a/src/gui/configure.py b/src/gui/configure.py
index 537c66637..1e7e9b0fd 100644
--- a/src/gui/configure.py
+++ b/src/gui/configure.py
@@ -46,7 +46,7 @@ import gobject
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import const
 import gen.datehandler
 from gen.display.name import displayer as _nd
diff --git a/src/gui/dbloader.py b/src/gui/dbloader.py
index 3ed7189d5..b2bb77883 100644
--- a/src/gui/dbloader.py
+++ b/src/gui/dbloader.py
@@ -55,7 +55,7 @@ import gobject
 #
 #-------------------------------------------------------------------------
 from cli.grampscli import CLIDbLoader
-import config
+from gen.config import config
 import gen.db
 import Utils
 from gui.pluginmanager import GuiPluginManager
diff --git a/src/gui/dialog.py b/src/gui/dialog.py
index f5c243f9e..b9fe26916 100644
--- a/src/gui/dialog.py
+++ b/src/gui/dialog.py
@@ -41,7 +41,7 @@ from gtk.gdk import pixbuf_new_from_file
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gui.glade import Glade
 from gen.ggettext import gettext as _
 
diff --git a/src/gui/display.py b/src/gui/display.py
index d16da83fa..e99490285 100644
--- a/src/gui/display.py
+++ b/src/gui/display.py
@@ -22,7 +22,7 @@
 
 import const
 import constfunc
-import config
+from gen.config import config
 import locale
 import os
 
diff --git a/src/gui/displaystate.py b/src/gui/displaystate.py
index 3a1820051..5d7da1e4d 100644
--- a/src/gui/displaystate.py
+++ b/src/gui/displaystate.py
@@ -56,7 +56,7 @@ import gobject
 import gen.utils
 from gui.utils import process_pending_events
 from gui.views.navigationview import NavigationView
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from gui.managedwindow import GrampsWindowManager
 from gen.relationship import get_relationship_calculator
diff --git a/src/gui/editors/addmedia.py b/src/gui/editors/addmedia.py
index c96e85c63..30612f0ba 100644
--- a/src/gui/editors/addmedia.py
+++ b/src/gui/editors/addmedia.py
@@ -51,7 +51,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 import Utils
 import gen.mime
 from gui.thumbnails import find_mime_type_pixbuf
diff --git a/src/gui/editors/displaytabs/eventrefmodel.py b/src/gui/editors/displaytabs/eventrefmodel.py
index ce104d33e..932b92b8f 100644
--- a/src/gui/editors/displaytabs/eventrefmodel.py
+++ b/src/gui/editors/displaytabs/eventrefmodel.py
@@ -43,7 +43,7 @@ import cgi
 #
 #-------------------------------------------------------------------------
 import gen.datehandler
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gui/editors/editfamily.py b/src/gui/editors/editfamily.py
index 336c51e29..ac9cdd279 100644
--- a/src/gui/editors/editfamily.py
+++ b/src/gui/editors/editfamily.py
@@ -28,7 +28,7 @@
 # python modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db as bsddb_db
 else:
@@ -61,7 +61,7 @@ import gobject
 #
 #-------------------------------------------------------------------------
 import Utils
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from gen.utils import get_marriage_or_fallback
 import gen.lib
diff --git a/src/gui/editors/editname.py b/src/gui/editors/editname.py
index 0db135487..f43cbc46c 100644
--- a/src/gui/editors/editname.py
+++ b/src/gui/editors/editname.py
@@ -45,7 +45,7 @@ import gtk
 # gramps modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from editsecondary import EditSecondary
 from gen.lib import NoteType
diff --git a/src/gui/editors/editnote.py b/src/gui/editors/editnote.py
index ddb4397b5..16aa334a3 100644
--- a/src/gui/editors/editnote.py
+++ b/src/gui/editors/editnote.py
@@ -47,7 +47,7 @@ import pango
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import const
 from editprimary import EditPrimary
 from displaytabs import GrampsTab, NoteBackRefList
diff --git a/src/gui/editors/editperson.py b/src/gui/editors/editperson.py
index f5cc30f04..c27e48d5e 100644
--- a/src/gui/editors/editperson.py
+++ b/src/gui/editors/editperson.py
@@ -63,7 +63,7 @@ from gui.glade import Glade
 from editprimary import EditPrimary
 from editmediaref import EditMediaRef
 from editname import EditName
-import config
+from gen.config import config
 from gui.dialog import ErrorDialog, ICON
 from gen.errors import ValidationError
 
diff --git a/src/gui/editors/editprimary.py b/src/gui/editors/editprimary.py
index 024416fe0..8857af3b5 100644
--- a/src/gui/editors/editprimary.py
+++ b/src/gui/editors/editprimary.py
@@ -43,7 +43,7 @@ import gtk
 from gui.managedwindow import ManagedWindow
 import gen.datehandler
 from gen.display.name import displayer as name_displayer
-import config
+from gen.config import config
 import gui.utils
 from gui.display import display_help
 from gui.dialog import SaveDialog
diff --git a/src/gui/editors/editreference.py b/src/gui/editors/editreference.py
index 1d83d45ee..e5f61de13 100644
--- a/src/gui/editors/editreference.py
+++ b/src/gui/editors/editreference.py
@@ -35,7 +35,7 @@ import gtk
 #-------------------------------------------------------------------------
 from gui.managedwindow import ManagedWindow
 from displaytabs import GrampsTab
-import config
+from gen.config import config
 from gui.dbguielement import DbGUIElement
 
 #-------------------------------------------------------------------------
diff --git a/src/gui/editors/editsecondary.py b/src/gui/editors/editsecondary.py
index 506c99749..73fb91e0b 100644
--- a/src/gui/editors/editsecondary.py
+++ b/src/gui/editors/editsecondary.py
@@ -23,7 +23,7 @@
 
 from gui.managedwindow import ManagedWindow
 from gui.display import display_help
-import config
+from gen.config import config
 from gui.dbguielement import DbGUIElement
 
 class EditSecondary(ManagedWindow, DbGUIElement):
diff --git a/src/gui/filters/sidebar/_sidebarfilter.py b/src/gui/filters/sidebar/_sidebarfilter.py
index 1d12a7894..c4be2b5fb 100644
--- a/src/gui/filters/sidebar/_sidebarfilter.py
+++ b/src/gui/filters/sidebar/_sidebarfilter.py
@@ -28,7 +28,7 @@ import pango
 
 from gui import widgets
 from gui.dbguielement import DbGUIElement
-import config
+from gen.config import config
 
 _RETURN = gtk.gdk.keyval_from_name("Return")
 _KP_ENTER = gtk.gdk.keyval_from_name("KP_Enter")
diff --git a/src/gui/grampsgui.py b/src/gui/grampsgui.py
index ca8308445..1414f8a0d 100644
--- a/src/gui/grampsgui.py
+++ b/src/gui/grampsgui.py
@@ -56,7 +56,7 @@ import gobject
 # GRAMPS Modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 import const
 import constfunc
 import Utils
diff --git a/src/gui/logger/_errorreportassistant.py b/src/gui/logger/_errorreportassistant.py
index 2e087a280..08d6b91af 100644
--- a/src/gui/logger/_errorreportassistant.py
+++ b/src/gui/logger/_errorreportassistant.py
@@ -32,7 +32,7 @@ import gobject
 import cairo
 import sys, os
 
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     import bsddb3 as bsddb
 else:
diff --git a/src/gui/managedwindow.py b/src/gui/managedwindow.py
index 5afbc0171..d37392333 100644
--- a/src/gui/managedwindow.py
+++ b/src/gui/managedwindow.py
@@ -48,7 +48,7 @@ import gtk
 #-------------------------------------------------------------------------
 import const
 from gen.errors import WindowActiveError
-import config
+from gen.config import config
 from gui.glade import Glade
 
 #-------------------------------------------------------------------------
diff --git a/src/gui/plug/_windows.py b/src/gui/plug/_windows.py
index a26147d36..459b24e6c 100644
--- a/src/gui/plug/_windows.py
+++ b/src/gui/plug/_windows.py
@@ -58,7 +58,7 @@ from gui.dialog import InfoDialog
 from gui.editors import EditPerson
 import Utils
 import const
-import config
+from gen.config import config
 
 def display_message(message):
     """
diff --git a/src/gui/plug/export/_exportassistant.py b/src/gui/plug/export/_exportassistant.py
index 7fe351168..7a849a33d 100644
--- a/src/gui/plug/export/_exportassistant.py
+++ b/src/gui/plug/export/_exportassistant.py
@@ -56,7 +56,7 @@ import gtk
 #-------------------------------------------------------------------------
 
 import const
-import config
+from gen.config import config
 from gui.pluginmanager import GuiPluginManager
 import Utils
 from gui.managedwindow import ManagedWindow
diff --git a/src/gui/plug/export/_exportoptions.py b/src/gui/plug/export/_exportoptions.py
index e7dbf9de3..216fce224 100644
--- a/src/gui/plug/export/_exportoptions.py
+++ b/src/gui/plug/export/_exportoptions.py
@@ -37,7 +37,7 @@
 #-------------------------------------------------------------------------
 from gen.ggettext import gettext as _
 from gen.ggettext import ngettext
-import config
+from gen.config import config
 from gen.display.name import displayer as name_displayer
 from gen.filters import GenericFilter, rules
 from gui.utils import ProgressMeter
diff --git a/src/gui/plug/report/_docreportdialog.py b/src/gui/plug/report/_docreportdialog.py
index bb8442648..7fd21e349 100644
--- a/src/gui/plug/report/_docreportdialog.py
+++ b/src/gui/plug/report/_docreportdialog.py
@@ -42,7 +42,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from _reportdialog import ReportDialog
 from _papermenu import PaperFrame
 from gui.pluginmanager import GuiPluginManager
diff --git a/src/gui/plug/report/_graphvizreportdialog.py b/src/gui/plug/report/_graphvizreportdialog.py
index 3761824ea..d94231823 100644
--- a/src/gui/plug/report/_graphvizreportdialog.py
+++ b/src/gui/plug/report/_graphvizreportdialog.py
@@ -45,7 +45,7 @@ import gobject
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------------
-import config
+from gen.config import config
 from gen.plug.report import CATEGORY_GRAPHVIZ
 from _reportdialog import ReportDialog
 from _papermenu import PaperFrame
diff --git a/src/gui/plug/report/_reportdialog.py b/src/gui/plug/report/_reportdialog.py
index aa0448091..1d7692352 100644
--- a/src/gui/plug/report/_reportdialog.py
+++ b/src/gui/plug/report/_reportdialog.py
@@ -49,7 +49,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 from gen.ggettext import gettext as _
-import config
+from gen.config import config
 from gen.errors import DatabaseError, FilterError, ReportError, WindowActiveError
 from gui.utils import open_file_with_default_application
 from gui.plug import add_gui_options
diff --git a/src/gui/pluginmanager.py b/src/gui/pluginmanager.py
index 7fb9624fe..d0cebfec2 100644
--- a/src/gui/pluginmanager.py
+++ b/src/gui/pluginmanager.py
@@ -45,7 +45,7 @@ import gtk
 import gen.utils
 from gen.plug import BasePluginManager, PluginRegister
 from constfunc import win
-import config
+from gen.config import config
 import const
 
 #-------------------------------------------------------------------------
diff --git a/src/gui/spell.py b/src/gui/spell.py
index 6dd2a583f..ac7afd0e7 100644
--- a/src/gui/spell.py
+++ b/src/gui/spell.py
@@ -64,7 +64,7 @@ if not HAVE_GTKSPELL:
 # GRAMPS classes
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gui/tipofday.py b/src/gui/tipofday.py
index 1254b499a..3d385539b 100644
--- a/src/gui/tipofday.py
+++ b/src/gui/tipofday.py
@@ -46,7 +46,7 @@ import os
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from gui.managedwindow import ManagedWindow
 from gui.dialog import ErrorDialog
 from gui.glade import Glade
diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py
index d5ea7703d..677627c5f 100644
--- a/src/gui/viewmanager.py
+++ b/src/gui/viewmanager.py
@@ -80,7 +80,7 @@ from gen.relationship import get_relationship_calculator
 from gui.displaystate import DisplayState, RecentDocsMenu
 import const
 import constfunc
-import config
+from gen.config import config
 from gen.errors import WindowActiveError
 from gui.dialog import (ErrorDialog, WarningDialog, QuestionDialog2,
                             InfoDialog)
diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py
index d0192b0ea..96970d194 100644
--- a/src/gui/views/listview.py
+++ b/src/gui/views/listview.py
@@ -53,7 +53,7 @@ import pango
 from gui.views.pageview import PageView
 from gui.views.navigationview import NavigationView
 from gui.columnorder import ColumnOrder
-import config
+from gen.config import config
 from gen.errors import WindowActiveError
 from gui.filters import SearchBar
 from gui.utils import add_menuitem
diff --git a/src/gui/views/pageview.py b/src/gui/views/pageview.py
index 76bc3c9e5..b74f3b2aa 100644
--- a/src/gui/views/pageview.py
+++ b/src/gui/views/pageview.py
@@ -51,7 +51,7 @@ from gui.dbguielement import DbGUIElement
 from gui.widgets.menutoolbuttonaction import MenuToolButtonAction
 from gui.grampsbar import GrampsBar
 from gui.configure import ConfigureDialog
-from config import config
+from gen.config import config
 
 #------------------------------------------------------------------------------
 #
diff --git a/src/gui/views/treemodels/citationbasemodel.py b/src/gui/views/treemodels/citationbasemodel.py
index 6d89bdd21..62ecfffb0 100644
--- a/src/gui/views/treemodels/citationbasemodel.py
+++ b/src/gui/views/treemodels/citationbasemodel.py
@@ -42,7 +42,7 @@ LOG = logging.getLogger(".citation")
 import gen.datehandler
 import gen.lib
 from Utils import confidence, format_time
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gui/views/treemodels/eventmodel.py b/src/gui/views/treemodels/eventmodel.py
index f9ebc69d5..5789021e3 100644
--- a/src/gui/views/treemodels/eventmodel.py
+++ b/src/gui/views/treemodels/eventmodel.py
@@ -43,7 +43,7 @@ import gtk
 import gen.datehandler
 import gen.lib
 import Utils
-import config
+from gen.config import config
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
 
 #-------------------------------------------------------------------------
diff --git a/src/gui/views/treemodels/familymodel.py b/src/gui/views/treemodels/familymodel.py
index af86e0861..764e97253 100644
--- a/src/gui/views/treemodels/familymodel.py
+++ b/src/gui/views/treemodels/familymodel.py
@@ -47,7 +47,7 @@ from gen.display.name import displayer as name_displayer
 import gen.lib
 from gen.lib import EventRoleType
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
-import config
+from gen.config import config
 
 invalid_date_format = config.get('preferences.invalid-date-format')
 
diff --git a/src/gui/views/treemodels/peoplemodel.py b/src/gui/views/treemodels/peoplemodel.py
index ad86dad58..4bbd685bd 100644
--- a/src/gui/views/treemodels/peoplemodel.py
+++ b/src/gui/views/treemodels/peoplemodel.py
@@ -63,7 +63,7 @@ import Utils
 from lru import LRU
 from gui.views.treemodels.flatbasemodel import FlatBaseModel
 from gui.views.treemodels.treebasemodel import TreeBaseModel
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/gui/widgets/styledtexteditor.py b/src/gui/widgets/styledtexteditor.py
index 068361b6d..eec5a4f0e 100644
--- a/src/gui/widgets/styledtexteditor.py
+++ b/src/gui/widgets/styledtexteditor.py
@@ -59,7 +59,7 @@ from gui.widgets.toolcomboentry import ToolComboEntry
 from gui.widgets.springseparator import SpringSeparatorAction
 from gui.spell import Spell
 from gui.display import display_url
-import config
+from gen.config import config
 from constfunc import has_display
 
 #-------------------------------------------------------------------------
diff --git a/src/guiQML/grampsqml.py b/src/guiQML/grampsqml.py
index d8bf2095d..0f47ad67f 100644
--- a/src/guiQML/grampsqml.py
+++ b/src/guiQML/grampsqml.py
@@ -44,7 +44,7 @@ LOG = logging.getLogger(".grampsqml")
 #
 #-------------------------------------------------------------------------
 import constfunc
-import config
+from gen.config import config
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/plugins/drawreport/FanChart.py b/src/plugins/drawreport/FanChart.py
index 68d1088df..92b743d28 100644
--- a/src/plugins/drawreport/FanChart.py
+++ b/src/plugins/drawreport/FanChart.py
@@ -48,7 +48,7 @@ from gen.plug.menu import EnumeratedListOption, NumberOption, PersonOption
 from gen.plug.report import Report
 from gen.plug.report import utils as ReportUtils
 from gen.plug.report import MenuReportOptions
-import config
+from gen.config import config
 
 #------------------------------------------------------------------------
 #
diff --git a/src/plugins/drawreport/TimeLine.py b/src/plugins/drawreport/TimeLine.py
index efba66c7d..48472e076 100644
--- a/src/plugins/drawreport/TimeLine.py
+++ b/src/plugins/drawreport/TimeLine.py
@@ -47,7 +47,7 @@ from gen.plug.docgen import (FontStyle, ParagraphStyle, GraphicsStyle,
                     FONT_SANS_SERIF, DASHED, PARA_ALIGN_CENTER)
 from gen.sort import Sort
 from gen.display.name import displayer as name_displayer
-import config
+from gen.config import config
 from gen.utils import get_birth_or_fallback, get_death_or_fallback
 
 #------------------------------------------------------------------------
diff --git a/src/plugins/export/ExportGeneWeb.py b/src/plugins/export/ExportGeneWeb.py
index a63125e72..39663fc04 100644
--- a/src/plugins/export/ExportGeneWeb.py
+++ b/src/plugins/export/ExportGeneWeb.py
@@ -51,7 +51,7 @@ from gui.plug.export import WriterOptionBox
 #import const
 import Utils
 from gui.glade import Glade
-import config
+from gen.config import config
 
 class GeneWebWriter(object):
     def __init__(self, database, filename, user, option_box=None):
diff --git a/src/plugins/gramplet/Events.py b/src/plugins/gramplet/Events.py
index d997d7299..459547d95 100644
--- a/src/plugins/gramplet/Events.py
+++ b/src/plugins/gramplet/Events.py
@@ -28,7 +28,7 @@ import gen.datehandler
 from gen.utils import get_birth_or_fallback, get_marriage_or_fallback
 from gen.errors import WindowActiveError
 import gtk
-import config
+from gen.config import config
 
 age_precision = config.get('preferences.age-display-precision')
 
diff --git a/src/plugins/gramplet/GivenNameGramplet.py b/src/plugins/gramplet/GivenNameGramplet.py
index df1d50683..5c1a1f188 100644
--- a/src/plugins/gramplet/GivenNameGramplet.py
+++ b/src/plugins/gramplet/GivenNameGramplet.py
@@ -24,7 +24,7 @@ from collections import defaultdict
 from gen.ggettext import gettext as _
 
 from gen.plug import Gramplet
-import config
+from gen.config import config
 
 _YIELD_INTERVAL = 350
 
diff --git a/src/plugins/gramplet/SurnameCloudGramplet.py b/src/plugins/gramplet/SurnameCloudGramplet.py
index bf217baee..f8c71a82f 100644
--- a/src/plugins/gramplet/SurnameCloudGramplet.py
+++ b/src/plugins/gramplet/SurnameCloudGramplet.py
@@ -27,7 +27,7 @@ from collections import defaultdict
 #------------------------------------------------------------------------
 from gen.plug import Gramplet
 from gen.ggettext import sgettext as _
-import config
+from gen.config import config
 
 #------------------------------------------------------------------------
 #
diff --git a/src/plugins/gramplet/TopSurnamesGramplet.py b/src/plugins/gramplet/TopSurnamesGramplet.py
index 095dbe0f5..eca3b6823 100644
--- a/src/plugins/gramplet/TopSurnamesGramplet.py
+++ b/src/plugins/gramplet/TopSurnamesGramplet.py
@@ -27,7 +27,7 @@ from collections import defaultdict
 #------------------------------------------------------------------------
 from gen.plug import Gramplet
 from gen.ggettext import sgettext as _
-import config
+from gen.config import config
 
 #------------------------------------------------------------------------
 #
diff --git a/src/plugins/import/ImportGedcom.py b/src/plugins/import/ImportGedcom.py
index a35f5e80e..771971bc5 100644
--- a/src/plugins/import/ImportGedcom.py
+++ b/src/plugins/import/ImportGedcom.py
@@ -50,7 +50,7 @@ import libgedcom
 module = __import__("libgedcom")
 reload (module)
 
-import config
+from gen.config import config
     
 #-------------------------------------------------------------------------
 #
diff --git a/src/plugins/lib/libgrdb.py b/src/plugins/lib/libgrdb.py
index aae3032e9..b112fb950 100644
--- a/src/plugins/lib/libgrdb.py
+++ b/src/plugins/lib/libgrdb.py
@@ -36,7 +36,7 @@ import random
 import locale
 import os
 from sys import maxint
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3 import db
 else:
diff --git a/src/plugins/lib/libpersonview.py b/src/plugins/lib/libpersonview.py
index 3d25ca781..857e42400 100644
--- a/src/plugins/lib/libpersonview.py
+++ b/src/plugins/lib/libpersonview.py
@@ -55,7 +55,7 @@ from gen.display.name import displayer as name_displayer
 from gui.dialog import ErrorDialog, QuestionDialog
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import PersonBookmarks
-import config
+from gen.config import config
 from gui.ddtargets import DdTargets
 from gui.editors import EditPerson
 from gui.filters.sidebar import PersonSidebarFilter
diff --git a/src/plugins/lib/libplaceview.py b/src/plugins/lib/libplaceview.py
index 9534a4851..b6f70c938 100644
--- a/src/plugins/lib/libplaceview.py
+++ b/src/plugins/lib/libplaceview.py
@@ -50,7 +50,7 @@ from gui.views.listview import ListView
 from gui.utils import add_menuitem
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import PlaceBookmarks
-import config
+from gen.config import config
 from gui.dialog import ErrorDialog
 from gui.pluginmanager import GuiPluginManager
 from gui.ddtargets import DdTargets
diff --git a/src/plugins/lib/libtranslate.py b/src/plugins/lib/libtranslate.py
index 20924248a..06501dc27 100644
--- a/src/plugins/lib/libtranslate.py
+++ b/src/plugins/lib/libtranslate.py
@@ -39,7 +39,7 @@ _ = gettext.gettext
 #------------------------------------------------------------------------
 import TransUtils
 import gen.datehandler
-import config
+from gen.config import config
 from gen.lib.grampstype import GrampsType
 
 #------------------------------------------------------------------------
diff --git a/src/plugins/lib/maps/geography.py b/src/plugins/lib/maps/geography.py
index 31ac0e7e0..8f8af181e 100644
--- a/src/plugins/lib/maps/geography.py
+++ b/src/plugins/lib/maps/geography.py
@@ -54,7 +54,7 @@ from gen.errors import WindowActiveError
 import const
 import constfunc
 from gui.managedwindow import ManagedWindow
-from config import config
+from gen.config import config
 from gui.editors import EditPlace, EditEvent, EditFamily, EditPerson
 from gui.selectors.selectplace import SelectPlace
 
diff --git a/src/plugins/lib/maps/osmGps.py b/src/plugins/lib/maps/osmGps.py
index e1d3c5395..9bac60c59 100644
--- a/src/plugins/lib/maps/osmGps.py
+++ b/src/plugins/lib/maps/osmGps.py
@@ -58,7 +58,7 @@ from selectionlayer import SelectionLayer
 from lifewaylayer import LifeWayLayer
 from datelayer import DateLayer
 from gen.ggettext import sgettext as _
-from config import config
+from gen.config import config
 from gui.dialog import ErrorDialog
 
 #-------------------------------------------------------------------------
diff --git a/src/plugins/quickview/AgeOnDate.py b/src/plugins/quickview/AgeOnDate.py
index 53382f97d..26c712d5e 100644
--- a/src/plugins/quickview/AgeOnDate.py
+++ b/src/plugins/quickview/AgeOnDate.py
@@ -33,7 +33,7 @@ from Utils import probably_alive
 from gen.ggettext import gettext as _
 import gen.datehandler
 import gen.lib
-import config
+from gen.config import config
 
 def run(database, document, date):
     """
diff --git a/src/plugins/sidebar/categorysidebar.py b/src/plugins/sidebar/categorysidebar.py
index 6e4c881bb..263c3539c 100644
--- a/src/plugins/sidebar/categorysidebar.py
+++ b/src/plugins/sidebar/categorysidebar.py
@@ -35,7 +35,7 @@ import gtk
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-import config
+from gen.config import config
 from gui.basesidebar import BaseSidebar
 from gui.viewmanager import get_available_views, views_to_show
 
diff --git a/src/plugins/tool/Check.py b/src/plugins/tool/Check.py
index 1cc622365..108b2b4f0 100644
--- a/src/plugins/tool/Check.py
+++ b/src/plugins/tool/Check.py
@@ -64,7 +64,7 @@ import gtk
 #-------------------------------------------------------------------------
 import gen.lib
 from gen.db import DbTxn
-import config
+from gen.config import config
 import Utils
 from gui.utils import ProgressMeter
 from gui.managedwindow import ManagedWindow
diff --git a/src/plugins/tool/Leak.py b/src/plugins/tool/Leak.py
index f78decc5a..f4953b534 100644
--- a/src/plugins/tool/Leak.py
+++ b/src/plugins/tool/Leak.py
@@ -32,7 +32,7 @@ Show uncollected objects in a window.
 #
 #------------------------------------------------------------------------
 from gen.ggettext import gettext as _
-import config
+from gen.config import config
 if config.get('preferences.use-bsddb3'):
     from bsddb3.db import DBError
 else:
diff --git a/src/plugins/tool/OwnerEditor.py b/src/plugins/tool/OwnerEditor.py
index 91a1f126c..8e4bebc1e 100644
--- a/src/plugins/tool/OwnerEditor.py
+++ b/src/plugins/tool/OwnerEditor.py
@@ -38,7 +38,7 @@ import gtk
 #
 #-------------------------------------------------------------------------
 import const
-import config
+from gen.config import config
 from Utils import get_researcher
 from gui.display import display_help
 from gui.widgets import MonitoredEntry
diff --git a/src/plugins/view/eventview.py b/src/plugins/view/eventview.py
index af50e5f68..52f0372ea 100644
--- a/src/plugins/view/eventview.py
+++ b/src/plugins/view/eventview.py
@@ -52,7 +52,7 @@ from gui.views.treemodels import EventModel
 import Utils
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import EventBookmarks
-import config
+from gen.config import config
 from gui.ddtargets import DdTargets
 from gui.dialog import ErrorDialog
 from gui.editors import EditEvent, DeleteEventQuery
diff --git a/src/plugins/view/familyview.py b/src/plugins/view/familyview.py
index 03a93a35b..485dc4653 100644
--- a/src/plugins/view/familyview.py
+++ b/src/plugins/view/familyview.py
@@ -51,7 +51,7 @@ from gui.views.treemodels import FamilyModel
 from gui.editors import EditFamily
 from gui.views.bookmarks import FamilyBookmarks
 from gen.errors import WindowActiveError
-import config
+from gen.config import config
 from gui.dialog import ErrorDialog
 from gui.filters.sidebar import FamilySidebarFilter
 from gui.merge import MergeFamily
diff --git a/src/plugins/view/geoclose.py b/src/plugins/view/geoclose.py
index 853800ad2..a73115402 100644
--- a/src/plugins/view/geoclose.py
+++ b/src/plugins/view/geoclose.py
@@ -49,7 +49,7 @@ _LOG = logging.getLogger("GeoGraphy.geoclose")
 #
 #-------------------------------------------------------------------------
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
diff --git a/src/plugins/view/geoevents.py b/src/plugins/view/geoevents.py
index fbb78cd9b..0e8ee8b60 100644
--- a/src/plugins/view/geoevents.py
+++ b/src/plugins/view/geoevents.py
@@ -56,7 +56,7 @@ _LOG = logging.getLogger("GeoGraphy.geoevents")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
diff --git a/src/plugins/view/geofamclose.py b/src/plugins/view/geofamclose.py
index 21bb45a51..740617238 100644
--- a/src/plugins/view/geofamclose.py
+++ b/src/plugins/view/geofamclose.py
@@ -49,7 +49,7 @@ _LOG = logging.getLogger("GeoGraphy.geofamilyclose")
 #
 #-------------------------------------------------------------------------
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
diff --git a/src/plugins/view/geofamily.py b/src/plugins/view/geofamily.py
index 047de002e..8eb74d8b9 100644
--- a/src/plugins/view/geofamily.py
+++ b/src/plugins/view/geofamily.py
@@ -56,7 +56,7 @@ _LOG = logging.getLogger("GeoGraphy.geofamily")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
diff --git a/src/plugins/view/geomoves.py b/src/plugins/view/geomoves.py
index ee3be88b1..4bb90d20a 100644
--- a/src/plugins/view/geomoves.py
+++ b/src/plugins/view/geomoves.py
@@ -52,7 +52,7 @@ _LOG = logging.getLogger("GeoGraphy.geomoves")
 #
 #-------------------------------------------------------------------------
 import gen.lib
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
diff --git a/src/plugins/view/geoperson.py b/src/plugins/view/geoperson.py
index f2988f94b..a7c93ade2 100644
--- a/src/plugins/view/geoperson.py
+++ b/src/plugins/view/geoperson.py
@@ -57,7 +57,7 @@ _LOG = logging.getLogger("GeoGraphy.geoperson")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 import gen.datehandler
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
diff --git a/src/plugins/view/geoplaces.py b/src/plugins/view/geoplaces.py
index 46e2e47c2..587b58f6f 100644
--- a/src/plugins/view/geoplaces.py
+++ b/src/plugins/view/geoplaces.py
@@ -57,7 +57,7 @@ _LOG = logging.getLogger("GeoGraphy.geoplaces")
 #-------------------------------------------------------------------------
 import gen.lib
 import Utils
-import config
+from gen.config import config
 from gen.display.name import displayer as _nd
 from gen.utils import conv_lat_lon
 from gui.views.pageview import PageView
diff --git a/src/plugins/view/htmlrenderer.py b/src/plugins/view/htmlrenderer.py
index 8454cfce1..d643515ec 100644
--- a/src/plugins/view/htmlrenderer.py
+++ b/src/plugins/view/htmlrenderer.py
@@ -61,7 +61,7 @@ from gui.views.navigationview import NavigationView
 from gui.views.bookmarks import PersonBookmarks
 import Utils
 import constfunc
-import config
+from gen.config import config
 from const import TEMP_DIR
 
 #-------------------------------------------------------------------------
diff --git a/src/plugins/view/mediaview.py b/src/plugins/view/mediaview.py
index 91bfaa480..30cc357b1 100644
--- a/src/plugins/view/mediaview.py
+++ b/src/plugins/view/mediaview.py
@@ -54,7 +54,7 @@ from gui.views.listview import ListView
 from gui.views.treemodels import MediaModel
 import const
 import constfunc
-import config
+from gen.config import config
 import Utils
 from gui.views.bookmarks import MediaBookmarks
 import gen.mime
diff --git a/src/plugins/view/noteview.py b/src/plugins/view/noteview.py
index 7902b49c9..92c237a56 100644
--- a/src/plugins/view/noteview.py
+++ b/src/plugins/view/noteview.py
@@ -50,7 +50,7 @@ from gui.views.treemodels import NoteModel
 import Utils
 from gen.errors import WindowActiveError
 from gui.views.bookmarks import NoteBookmarks
-import config
+from gen.config import config
 from gen.lib import Note
 from gui.ddtargets import DdTargets
 from gui.dialog import ErrorDialog
diff --git a/src/plugins/view/pedigreeview.py b/src/plugins/view/pedigreeview.py
index a2bd3dc9a..b22d54ced 100644
--- a/src/plugins/view/pedigreeview.py
+++ b/src/plugins/view/pedigreeview.py
@@ -59,7 +59,7 @@ from gen.errors import WindowActiveError
 from gui.editors import EditPerson, EditFamily
 from gui.ddtargets import DdTargets
 import cPickle as pickle
-import config
+from gen.config import config
 from gui.views.bookmarks import PersonBookmarks
 import const
 import constfunc
diff --git a/src/plugins/view/relview.py b/src/plugins/view/relview.py
index d6188c89f..e807bcb75 100644
--- a/src/plugins/view/relview.py
+++ b/src/plugins/view/relview.py
@@ -56,7 +56,7 @@ from Utils import media_path_full, probably_alive
 from gui.utils import open_file_with_default_application
 import gen.datehandler
 from gui.thumbnails import get_thumbnail_image
-import config
+from gen.config import config
 from gui import widgets
 from gui.selectors import SelectorFactory
 from gen.errors import WindowActiveError
diff --git a/src/plugins/view/repoview.py b/src/plugins/view/repoview.py
index b99e67ebd..d5ff20337 100644
--- a/src/plugins/view/repoview.py
+++ b/src/plugins/view/repoview.py
@@ -41,7 +41,7 @@ from gui.views.listview import ListView
 from gui.views.treemodels import RepositoryModel
 from gui.views.bookmarks import RepoBookmarks
 from gen.errors import WindowActiveError
-import config
+from gen.config import config
 from gui.editors import EditRepository, DeleteRepositoryQuery
 from gui.ddtargets import DdTargets
 from gui.dialog import ErrorDialog
diff --git a/src/plugins/view/sourceview.py b/src/plugins/view/sourceview.py
index 40f7e6483..2935100f1 100644
--- a/src/plugins/view/sourceview.py
+++ b/src/plugins/view/sourceview.py
@@ -40,7 +40,7 @@ LOG = logging.getLogger(".citation")
 #
 #-------------------------------------------------------------------------
 import gen.lib
-import config
+from gen.config import config
 from gui.views.listview import ListView
 from gui.views.treemodels import SourceModel
 import Utils