diff --git a/ChangeLog b/ChangeLog
index 0ba91ebb8..ba0a36493 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,69 @@
+2007-02-02  Christian Persch  <chpe@svn.gnome.org>
+
+	* Makefile.am:
+	* capplets/about-me/Makefile.am:
+	* capplets/about-me/gnome-about-me-password.c: (passdlg_init):
+	* capplets/about-me/gnome-about-me.c: (about_me_setup_dialog):
+	* capplets/accessibility/at-properties/Makefile.am:
+	* capplets/accessibility/keyboard/Makefile.am:
+	* capplets/accessibility/keyboard/accessibility-keyboard.c:
+	(setup_accessX_dialog):
+	* capplets/background/Makefile.am:
+	* capplets/background/gnome-wp-capplet.c: (gnome_wp_create_dialog):
+	* capplets/common/Makefile.am:
+	* capplets/common/capplet-util.c: (capplet_set_icon):
+	* capplets/default-applications/Makefile.am:
+	* capplets/display/Makefile.am:
+	* capplets/file-types/Makefile.am:
+	* capplets/file-types/file-types-capplet.c: (create_dialog):
+	* capplets/file-types/mime-category-edit-dialog.c:
+	(mime_category_edit_dialog_init):
+	* capplets/file-types/mime-edit-dialog.c: (mime_edit_dialog_init):
+	* capplets/file-types/service-edit-dialog.c:
+	(service_edit_dialog_init):
+	* capplets/font/Makefile.am:
+	* capplets/keybindings/Makefile.am:
+	* capplets/keybindings/gnome-keybinding-properties.c:
+	(create_dialog):
+	* capplets/keyboard/Makefile.am:
+	* capplets/keyboard/gnome-keyboard-properties-xkblt.c:
+	(xkb_layout_choose):
+	* capplets/keyboard/gnome-keyboard-properties-xkbmc.c:
+	(choose_model):
+	* capplets/keyboard/gnome-keyboard-properties.c: (create_dialog):
+	* capplets/localization/Makefile.am:
+	* capplets/localization/gnome-localization-properties.c:
+	(create_dialog):
+	* capplets/mime-type/Makefile.am:
+	* capplets/mouse/Makefile.am:
+	* capplets/mouse/gnome-mouse-properties.c: (create_dialog):
+	* capplets/network/Makefile.am:
+	* capplets/network/gnome-network-preferences.c:
+	(cb_http_details_button_clicked), (main):
+	* capplets/rollback/Makefile.am:
+	* capplets/sound/Makefile.am:
+	* capplets/sound/sound-properties-capplet.c: (create_dialog),
+	(device_test_button_clicked):
+	* capplets/theme-switcher/Makefile.am:
+	* capplets/ui-properties/Makefile.am:
+	* capplets/ui-properties/gnome-ui-properties.c: (create_dialog):
+	* capplets/url-properties/Makefile.am:
+	* capplets/windows/Makefile.am:
+	* capplets/wm-properties/wm-desktops/Makefile.am:
+	* configure.in:
+	* gnome-settings-daemon/Makefile.am:
+	* gnome-settings-daemon/actions/Makefile.am:
+	* gnome-settings-daemon/gnome-settings-xmodmap.c:
+	(gnome_settings_modmap_dialog_call):
+	* gnome-settings-daemon/gnome-settings-xrdb.c:
+	* gnome-settings-daemon/gsd-media-keys-window.c: (action_changed),
+	(gsd_media_keys_window_init):
+	* gnome-settings-daemon/xrdb/Makefile.am:
+	* typing-break/Makefile.am:
+	* vfs-methods/themus/Makefile.am: Don't define directories in
+	configure. Remove some obsolete defines, and use the standard
+	installation paths. Bug #395383.
+
 2007-01-31  Christian Persch  <chpe@svn.gnome.org>
 
 	* configure.in:
diff --git a/Makefile.am b/Makefile.am
index 23dcccbc8..1a02d1edf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods idl schemas $(TYPING_BREAK)
+SUBDIRS = po libsounds libbackground libwindow-settings libslab gnome-settings-daemon capplets shell help vfs-methods schemas $(TYPING_BREAK)
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am
index 6c0c58f82..721b39b93 100644
--- a/capplets/about-me/Makefile.am
+++ b/capplets/about-me/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = gnome-about-me
 
-pixmapdir = $(GNOMECC_PIXMAPS_DIR)
+pixmapdir = $(pkgdatadir)/pixmaps
 pixmap_DATA = 				\
 	gnome-about-me-lock.png		\
 	gnome-about-me-lock-open.png
@@ -23,7 +23,7 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = gnome-about-me.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-about-me.glade
 
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBEBOOK_CFLAGS)
diff --git a/capplets/about-me/gnome-about-me-password.c b/capplets/about-me/gnome-about-me-password.c
index 978e25f2c..62390aa27 100644
--- a/capplets/about-me/gnome-about-me-password.c
+++ b/capplets/about-me/gnome-about-me-password.c
@@ -984,7 +984,7 @@ passdlg_init (PasswordDialog *pdialog, GtkWindow *parent)
 	GtkAccelGroup	*group;
 	
 	/* Initialize dialog */
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-about-me.glade", "change-password", NULL);
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade", "change-password", NULL);
 	pdialog->xml = dialog;
 	
 	wpassdlg = WID ("change-password");
diff --git a/capplets/about-me/gnome-about-me.c b/capplets/about-me/gnome-about-me.c
index feeb6e98a..8bfdb1e3c 100644
--- a/capplets/about-me/gnome-about-me.c
+++ b/capplets/about-me/gnome-about-me.c
@@ -730,7 +730,7 @@ about_me_setup_dialog (void)
 
 	me = g_new0 (GnomeAboutMe, 1);
 
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-about-me.glade", 
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-about-me.glade",
 				"about-me-dialog", NULL);
 
 	if (dialog == NULL) {
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index ba69aa465..dbfdca699 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -13,18 +13,19 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = at-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+pixmapdir  = $(pkgdatadir)/pixmaps
 pixmap_DATA =					\
 	at-startup.png				\
 	at-support.png
 
-gladedir = $(GNOMECC_GLADE_DIR)
+gladedir = $(pkgdatadir)/glade
 glade_DATA = at-enable-dialog.glade
 
 INCLUDES   = $(AT_CAPPLET_CFLAGS)     \
              $(GNOMECC_CAPPLETS_CFLAGS) \
 	     -DGLADEDIR=\""$(gladedir)"\" \
 	     -DPIXMAPDIR=\""$(pixmapdir)"\" \
+	     -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	     -DGNOMELOCALEDIR="\"$(datadir)/locale\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)
diff --git a/capplets/accessibility/keyboard/Makefile.am b/capplets/accessibility/keyboard/Makefile.am
index 8d0f77c2e..0884d3901 100644
--- a/capplets/accessibility/keyboard/Makefile.am
+++ b/capplets/accessibility/keyboard/Makefile.am
@@ -15,7 +15,7 @@ gnome_accessibility_keyboard_properties_LDADD = \
 
 @INTLTOOL_DESKTOP_RULE@
 
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+pixmapdir  = $(pkgdatadir)/pixmaps
 pixmap_DATA = \
 	accessibility-keyboard-togglekey.png \
 	accessibility-keyboard-mousekey.png \
@@ -23,14 +23,20 @@ pixmap_DATA = \
 	accessibility-keyboard-stickykey.png \
 	accessibility-keyboard-bouncekey.png
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-accessibility-keyboard-properties.glade
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = accessibility-keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS)			\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""	\
+	-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
+
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA)
 
diff --git a/capplets/accessibility/keyboard/accessibility-keyboard.c b/capplets/accessibility/keyboard/accessibility-keyboard.c
index 539516787..cb3263e39 100644
--- a/capplets/accessibility/keyboard/accessibility-keyboard.c
+++ b/capplets/accessibility/keyboard/accessibility-keyboard.c
@@ -456,8 +456,7 @@ setup_accessX_dialog (GConfChangeSet *changeset)
 {
 	GConfClient *client;
 	char const  *toplevel_name = "accessX_dialog";
-	GladeXML    *dialog = glade_xml_new (GNOMECC_DATA_DIR
-		"/interfaces/gnome-accessibility-keyboard-properties.glade",
+	GladeXML    *dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-accessibility-keyboard-properties.glade",
 		toplevel_name, NULL);
 	GtkWidget *toplevel = WID (toplevel_name);
 
diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index 9970c1911..5d214fa65 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -3,6 +3,7 @@ WALLPAPER_DATADIR = $(datadir)/gnome-background-properties
 INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\"" \
 	-DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\"
 
 bin_PROGRAMS = gnome-background-properties
@@ -31,7 +32,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-gladedir = $(GNOMECC_GLADE_DIR)
+gladedir = $(pkgdatadir)/glade
 glade_DATA = gnome-background-properties.glade
 
 install-data-local:
diff --git a/capplets/background/gnome-wp-capplet.c b/capplets/background/gnome-wp-capplet.c
index 47f822c5b..f94ad30ff 100644
--- a/capplets/background/gnome-wp-capplet.c
+++ b/capplets/background/gnome-wp-capplet.c
@@ -797,8 +797,7 @@ static GladeXML * gnome_wp_create_dialog (void) {
   GladeXML * new;
   gchar * gladefile;
 
-  gladefile = g_build_filename (GNOMECC_DATA_DIR,
-				"interfaces",
+  gladefile = g_build_filename (GNOMECC_GLADE_DIR,
 				"gnome-background-properties.glade",
 				NULL);
 
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
index f3aaad0d8..b441ab386 100644
--- a/capplets/common/Makefile.am
+++ b/capplets/common/Makefile.am
@@ -1,8 +1,10 @@
 EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in
 
 INCLUDES = \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""				\
+	-DGNOMECC_ICONS_DIR="\"$(pkgdatadir)/icons\""			\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"			\
+	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"			\
 	-DG_LOG_DOMAIN=\"capplet-common\"				\
 	-DINSTALL_PREFIX=\"$(prefix)\"					\
 	-I$(top_srcdir)							\
diff --git a/capplets/common/capplet-util.c b/capplets/common/capplet-util.c
index 32b0c0e5c..363b81d6b 100644
--- a/capplets/common/capplet-util.c
+++ b/capplets/common/capplet-util.c
@@ -382,7 +382,7 @@ capplet_set_icon (GtkWidget *window, char const *icon_file_name)
 
 	if (icon_pixbuf == NULL) {
 		/* Then we fallback to the control center icon location */
-		path = g_strconcat (GNOMECC_DATA_DIR "/icons/", icon_file_name, NULL);
+		path = g_build_filename (GNOMECC_ICONS_DIR, icon_file_name, NULL);
 
 		icon_pixbuf = gdk_pixbuf_new_from_file (path, NULL);
 		g_free (path);
diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am
index 3e082ce0c..090f1f4a1 100644
--- a/capplets/default-applications/Makefile.am
+++ b/capplets/default-applications/Makefile.am
@@ -8,7 +8,7 @@ gnome_default_applications_properties_SOURCES = \
 
 @INTLTOOL_DESKTOP_RULE@
 
-gladedir   = $(GNOMECC_GLADE_DIR)
+gladedir   = $(pkgdatadir)/glade
 glade_DATA = gnome-default-applications-properties.glade
 
 desktopdir = $(datadir)/applications
@@ -16,7 +16,7 @@ Desktop_in_files = default-applications.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 xmldata_in_files = gnome-default-applications.xml.in
-xmldatadir = $(datadir)/gnome-default-applications
+xmldatadir = $(pkgdatadir)/gnome-default-applications
 xmldata_DATA = $(xmldata_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 56b4ac38a..06ca6f796 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -7,7 +7,7 @@ gnome_display_properties_LDFLAGS = -export-dynamic
 
 @INTLTOOL_DESKTOP_RULE@
 
-iconsdir   = $(GNOMECC_ICONS_DIR)
+iconsdir   = $(pkgdatadir)/icons
 icons_DATA = display-capplet.png
 
 desktop_iconsdir = $(datadir)/pixmaps
@@ -21,7 +21,7 @@ INCLUDES   = $(DISPLAY_CAPPLET_CFLAGS)     \
              $(GNOMECC_CAPPLETS_CFLAGS) \
 	     -DGLADEDIR=\""$(gladedir)"\" \
 	     -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-	     -DPIXMAPDIR=\""$(pixmapdir)"\"
+	     -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(icons_DATA)
diff --git a/capplets/file-types/Makefile.am b/capplets/file-types/Makefile.am
index ca3eece12..1b9739d4b 100644
--- a/capplets/file-types/Makefile.am
+++ b/capplets/file-types/Makefile.am
@@ -16,7 +16,7 @@ gnome_file_types_properties_SOURCES =					\
 
 @INTLTOOL_DESKTOP_RULE@
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = file-types-properties.glade
 
 desktopdir = $(datadir)/applications
diff --git a/capplets/file-types/file-types-capplet.c b/capplets/file-types/file-types-capplet.c
index d58936154..ad8affefd 100644
--- a/capplets/file-types/file-types-capplet.c
+++ b/capplets/file-types/file-types-capplet.c
@@ -197,7 +197,7 @@ create_dialog (void)
 	GtkTreeViewColumn *column;
 	GtkTreeSelection  *selection;
 
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "main_dialog", NULL);
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/file-types-properties.glade", "main_dialog", NULL);
 
 	model = GTK_TREE_MODEL (mime_types_model_new (FALSE));
 	treeview = WID ("mime_types_tree");
diff --git a/capplets/file-types/mime-category-edit-dialog.c b/capplets/file-types/mime-category-edit-dialog.c
index 3604f45f3..b11737fea 100644
--- a/capplets/file-types/mime-category-edit-dialog.c
+++ b/capplets/file-types/mime-category-edit-dialog.c
@@ -123,7 +123,7 @@ mime_category_edit_dialog_init (MimeCategoryEditDialog *dialog, MimeCategoryEdit
 
 	dialog->p = g_new0 (MimeCategoryEditDialogPrivate, 1);
 	dialog->p->dialog_xml = glade_xml_new
-		(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "mime_category_edit_widget", NULL);
+		(GNOMECC_GLADE_DIR "/file-types-properties.glade", "mime_category_edit_widget", NULL);
 
 	dialog->p->model = NULL;
 	dialog->p->info = NULL;
diff --git a/capplets/file-types/mime-edit-dialog.c b/capplets/file-types/mime-edit-dialog.c
index c0adfbbea..3a676e19c 100644
--- a/capplets/file-types/mime-edit-dialog.c
+++ b/capplets/file-types/mime-edit-dialog.c
@@ -184,7 +184,7 @@ mime_edit_dialog_init (MimeEditDialog *dialog, MimeEditDialogClass *class)
 
 	dialog->p = g_new0 (MimeEditDialogPrivate, 1);
 	dialog->p->dialog_xml = glade_xml_new
-		(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "edit_widget", NULL);
+		(GNOMECC_GLADE_DIR "/file-types-properties.glade", "edit_widget", NULL);
 
 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	gtk_size_group_add_widget (size_group, WID ("description_label"));
diff --git a/capplets/file-types/service-edit-dialog.c b/capplets/file-types/service-edit-dialog.c
index d01b59282..a4c993dab 100644
--- a/capplets/file-types/service-edit-dialog.c
+++ b/capplets/file-types/service-edit-dialog.c
@@ -125,7 +125,7 @@ service_edit_dialog_init (ServiceEditDialog *dialog, ServiceEditDialogClass *cla
 
 	dialog->p = g_new0 (ServiceEditDialogPrivate, 1);
 	dialog->p->dialog_xml = glade_xml_new
-		(GNOMECC_DATA_DIR "/interfaces/file-types-properties.glade", "service_edit_widget", NULL);
+		(GNOMECC_GLADE_DIR "/file-types-properties.glade", "service_edit_widget", NULL);
 
 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	gtk_size_group_add_widget (size_group, WID ("description_label"));
diff --git a/capplets/font/Makefile.am b/capplets/font/Makefile.am
index ac56b917d..ad4cca595 100644
--- a/capplets/font/Makefile.am
+++ b/capplets/font/Makefile.am
@@ -11,7 +11,7 @@ gnome_font_properties_LDFLAGS = -export-dynamic
 
 @INTLTOOL_DESKTOP_RULE@
 
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+pixmapdir  = $(pkgdatadir)/pixmaps
 pixmap_DATA =					\
 	subpixel-rgb.png			\
 	subpixel-bgr.png			\
@@ -22,13 +22,14 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = font-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-gladedir = $(GNOMECC_GLADE_DIR)
+gladedir = $(pkgdatadir)/glade
 glade_DATA = font-properties.glade
 
 INCLUDES   = $(FONT_CAPPLET_CFLAGS)     \
              $(GNOMECC_CAPPLETS_CFLAGS) \
 	     -DGLADEDIR=\""$(gladedir)"\" \
 	     -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-	     -DPIXMAPDIR=\""$(pixmapdir)"\"
+	     -DPIXMAPDIR=\""$(pixmapdir)"\" \
+	     -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index bec9bb72d..42072662a 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -10,14 +10,18 @@ gnome_keybinding_properties_SOURCES = 	\
 
 @INTLTOOL_DESKTOP_RULE@
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-keybinding-properties.glade
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = keybinding.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS) \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA)
 
diff --git a/capplets/keybindings/gnome-keybinding-properties.c b/capplets/keybindings/gnome-keybinding-properties.c
index 31fe054c1..5611d1acc 100644
--- a/capplets/keybindings/gnome-keybinding-properties.c
+++ b/capplets/keybindings/gnome-keybinding-properties.c
@@ -169,7 +169,7 @@ create_dialog (void)
 {
   GladeXML *dialog;
 
-  dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
+  dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keybinding-properties.glade", "gnome-keybinding-dialog", NULL);
 
   return dialog;
 }
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 44d773f5a..766e0f675 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -13,10 +13,10 @@ gnome_keyboard_properties_LDADD =				\
 
 @INTLTOOL_DESKTOP_RULE@
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-keyboard-properties.glade
 
-pixmapsdir   = $(GNOMECC_PIXMAPS_DIR)
+pixmapsdir   = $(pkgdatadir)/pixmaps
 pixmaps_DATA = \
 	keyboard-repeat.png		\
 	keyboard-cursor.png		\
@@ -27,6 +27,11 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = keyboard.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBGNOMEKBDUI_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS) \
+	$(LIBGNOMEKBDUI_CFLAGS) \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA)
diff --git a/capplets/keyboard/gnome-keyboard-properties-xkblt.c b/capplets/keyboard/gnome-keyboard-properties-xkblt.c
index 7612507f9..aaa7d562f 100644
--- a/capplets/keyboard/gnome-keyboard-properties-xkblt.c
+++ b/capplets/keyboard/gnome-keyboard-properties-xkblt.c
@@ -657,8 +657,8 @@ void
 xkb_layout_choose (GladeXML * dialog)
 {
 	GladeXML *chooser_dialog =
-	    glade_xml_new (GNOMECC_DATA_DIR
-			   "/interfaces/gnome-keyboard-properties.glade",
+	    glade_xml_new (GNOMECC_GLADE_DIR
+			   "/gnome-keyboard-properties.glade",
 			   "xkb_layout_chooser", NULL);
 	GtkWidget *chooser = CWID ("xkb_layout_chooser");
 	GtkWidget *kbdraw = NULL;
diff --git a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c
index f0a3027fb..fbe1e4cf7 100644
--- a/capplets/keyboard/gnome-keyboard-properties-xkbmc.c
+++ b/capplets/keyboard/gnome-keyboard-properties-xkbmc.c
@@ -161,8 +161,8 @@ void
 choose_model (GladeXML * dialog)
 {
 	GladeXML *chooser_dialog =
-	    glade_xml_new (GNOMECC_DATA_DIR
-			   "/interfaces/gnome-keyboard-properties.glade",
+	    glade_xml_new (GNOMECC_GLADE_DIR
+			   "/gnome-keyboard-properties.glade",
 			   "xkb_model_chooser", NULL);
 	GtkWidget *chooser = CWID ("xkb_model_chooser");
 	gtk_window_set_transient_for (GTK_WINDOW (chooser),
diff --git a/capplets/keyboard/gnome-keyboard-properties.c b/capplets/keyboard/gnome-keyboard-properties.c
index 30a4ecf88..6d2bd2f3a 100644
--- a/capplets/keyboard/gnome-keyboard-properties.c
+++ b/capplets/keyboard/gnome-keyboard-properties.c
@@ -52,7 +52,7 @@ create_dialog (void)
 	GladeXML *dialog;
 	GtkSizeGroup *size_group;
 
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-keyboard-properties.glade", "keyboard_dialog", NULL);
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-keyboard-properties.glade", "keyboard_dialog", NULL);
 
 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 	gtk_size_group_add_widget (size_group, WID ("repeat_slow_label"));
diff --git a/capplets/localization/Makefile.am b/capplets/localization/Makefile.am
index c295d6fb9..f9b90b49e 100644
--- a/capplets/localization/Makefile.am
+++ b/capplets/localization/Makefile.am
@@ -9,10 +9,10 @@ gnome_localization_properties_LDADD =	\
 
 @INTLTOOL_DESKTOP_RULE@
 
-gladedir   = $(GNOMECC_GLADE_DIR)
+gladedir   = $(pkgdatadir)/glade
 glade_DATA = gnome-localization-properties.glade
 
-pixmapsdir   = $(GNOMECC_PIXMAPS_DIR)
+pixmapsdir   = $(pkgdatadir)/pixmaps
 pixmaps_DATA = \
 	localization-capplet.png
 
diff --git a/capplets/localization/gnome-localization-properties.c b/capplets/localization/gnome-localization-properties.c
index 07f14dfc1..89fc20915 100644
--- a/capplets/localization/gnome-localization-properties.c
+++ b/capplets/localization/gnome-localization-properties.c
@@ -63,7 +63,7 @@ create_dialog (void)
 	GladeXML *dialog;
 
 	dialog = glade_xml_new
-		(GNOMECC_DATA_DIR "/interfaces/gnome-localization-properties.glade",
+		(GNOMECC_GLADE_DIR "/gnome-localization-properties.glade",
 		 NULL, NULL);
 
 	return dialog;
diff --git a/capplets/mime-type/Makefile.am b/capplets/mime-type/Makefile.am
index 665c4a538..6452f1e01 100644
--- a/capplets/mime-type/Makefile.am
+++ b/capplets/mime-type/Makefile.am
@@ -21,9 +21,9 @@ pixmap_DATA =
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
-iconsdir   = $(GNOMECC_ICONS_DIR)
-Gladedir   = $(GNOMECC_GLADE_DIR)
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+iconsdir   = $(pkgdatadir)/icons
+Gladedir   = $(pkgdatadir)/glade
+pixmapdir  = $(pkgdatadir)/pixmaps
 Glade_DATA = $(cappletname)-properties.glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 0b8263a6f..98a97733e 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -5,7 +5,7 @@ gnome_mouse_properties_SOURCES = gnome-mouse-properties.c
 
 @INTLTOOL_DESKTOP_RULE@
 
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+pixmapdir  = $(pkgdatadir)/pixmaps
 pixmap_DATA = \
 	double-click-on.png		\
 	double-click-off.png		\
@@ -24,13 +24,17 @@ cursorfont_DATA = \
 	cursor-white.pcf		\
 	cursor-large-white.pcf
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-mouse-properties.glade
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = gnome-settings-mouse.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS) \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_DATA)
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 08aee68a1..7d389b2fa 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -982,7 +982,7 @@ create_dialog (void)
 	/* register the custom type */
 	(void) mouse_capplet_check_button_get_type ();
 
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL);
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-mouse-properties.glade", "mouse_properties_dialog", NULL);
 
 	text = g_strdup_printf ("<b>%s</b>", _("Pointer Theme"));
 	gtk_label_set_markup (GTK_LABEL (WID ("cursor_category_label")), text);
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
index b2a0d974b..003027a41 100644
--- a/capplets/network/Makefile.am
+++ b/capplets/network/Makefile.am
@@ -6,13 +6,17 @@ gnome_network_preferences_LDADD =				\
 
 @INTLTOOL_DESKTOP_RULE@
 
-gladedir   = $(GNOMECC_GLADE_DIR)
+gladedir   = $(pkgdatadir)/glade
 glade_DATA = gnome-network-preferences.glade
 
 desktopdir = $(datadir)/applications
 desktop_in_files = gnome-network-preferences.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS) \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(glade_DATA)
diff --git a/capplets/network/gnome-network-preferences.c b/capplets/network/gnome-network-preferences.c
index 8afcf2eb8..b2b091be8 100644
--- a/capplets/network/gnome-network-preferences.c
+++ b/capplets/network/gnome-network-preferences.c
@@ -225,7 +225,7 @@ cb_http_details_button_clicked (GtkWidget *button,
 		return;
 	}
 
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-network-preferences.glade",
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
 				"details_dialog", NULL);
 
 	details_dialog = widget = WID ("details_dialog");
@@ -545,7 +545,7 @@ main (int argc, char **argv)
 	gconf_client_add_dir (client, "/system/proxy",
 			      GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-network-preferences.glade",
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-network-preferences.glade",
 				"network_dialog", NULL);
 
 	setup_dialog (dialog);
diff --git a/capplets/rollback/Makefile.am b/capplets/rollback/Makefile.am
index 34973e174..e7e7830f8 100644
--- a/capplets/rollback/Makefile.am
+++ b/capplets/rollback/Makefile.am
@@ -13,7 +13,7 @@ rollback_capplet_SOURCES = \
 
 ####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 $(desktop).in: %.desktop.in: %.desktop.in.in
-	sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
+	sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(pkgdatadir)/icons/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)
@@ -25,9 +25,9 @@ install-data-am: install-data-local
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
-iconsdir   = $(GNOMECC_ICONS_DIR)
-Gladedir   = $(GNOMECC_GLADE_DIR)
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+iconsdir   = $(pkgdatadir)/icons
+Gladedir   = $(pkgdatadir)/glade
+pixmapdir  = $(pkgdatadir)/pixmaps
 Glade_DATA = $(cappletname).glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop
diff --git a/capplets/sound/Makefile.am b/capplets/sound/Makefile.am
index f2f0dcc3a..f0443a371 100644
--- a/capplets/sound/Makefile.am
+++ b/capplets/sound/Makefile.am
@@ -9,16 +9,22 @@ gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pip
 
 @INTLTOOL_DESKTOP_RULE@
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = sound-properties.glade
 
-desktop_iconsdir = $(GNOMECC_PIXMAPS_DIR)
+desktop_iconsdir = $(pkgdatadir)/pixmaps
 desktop_icons_DATA = visual-bell.png
 
 desktopdir = $(datadir)/applications
 Desktop_in_files = gnome-settings-sound.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS) $(SOUND_CAPPLET_CFLAGS) $(HAL_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS) \
+	$(SOUND_CAPPLET_CFLAGS) \
+	$(HAL_CFLAGS) \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA) $(desktop_icons_DATA)
diff --git a/capplets/sound/sound-properties-capplet.c b/capplets/sound/sound-properties-capplet.c
index 547553aeb..5bfb9bbfd 100644
--- a/capplets/sound/sound-properties-capplet.c
+++ b/capplets/sound/sound-properties-capplet.c
@@ -162,7 +162,7 @@ create_dialog (void)
 	GladeXML *dialog;
 	GtkWidget *widget, *box, *view;
 
-	dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/sound-properties.glade", "sound_prefs_dialog", NULL);
+	dialog = glade_xml_new (GNOMECC_GLADE_DIR "/sound-properties.glade", "sound_prefs_dialog", NULL);
 	widget = glade_xml_get_widget (dialog, "sound_prefs_dialog");
 
 	props = sound_properties_new ();
@@ -502,7 +502,7 @@ device_test_button_clicked (GtkWidget *button, gpointer user_data)
 {
 	DeviceChooser *device_chooser = (DeviceChooser *) user_data;
 	
-	GladeXML *dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/sound-properties.glade", NULL, NULL);
+	GladeXML *dialog = glade_xml_new (GNOMECC_GLADE_DIR "/sound-properties.glade", NULL, NULL);
 
 	user_test_pipeline (dialog, GTK_WINDOW (dialog_win), device_chooser->test_pipeline);
 	
diff --git a/capplets/theme-switcher/Makefile.am b/capplets/theme-switcher/Makefile.am
index d809191d8..7280db670 100644
--- a/capplets/theme-switcher/Makefile.am
+++ b/capplets/theme-switcher/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = gnome-theme-manager
 
-pixmapdir = $(GNOMECC_PIXMAPS_DIR)
+pixmapdir = $(pkgdatadir)/pixmaps
 pixmap_DATA = \
 	theme-thumbnailing.png
 
@@ -40,7 +40,7 @@ Desktop_in_files = gtk-theme-selector.desktop.in \
 									 gnome-theme-installer.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-gladedir = $(GNOMECC_GLADE_DIR)
+gladedir = $(pkgdatadir)/glade
 glade_DATA = theme-properties.glade
 
 INCLUDES   = 				\
@@ -48,7 +48,8 @@ INCLUDES   = 				\
 	$(METACITY_CFLAGS)		\
 	$(GNOMECC_CAPPLETS_CFLAGS)	\
 	-DGLADEDIR=\""$(gladedir)"\"	\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
 
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xml_files)
 EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files)
diff --git a/capplets/ui-properties/Makefile.am b/capplets/ui-properties/Makefile.am
index 80a58e875..79ca67018 100644
--- a/capplets/ui-properties/Makefile.am
+++ b/capplets/ui-properties/Makefile.am
@@ -10,9 +10,13 @@ desktopdir = $(datadir)/applications
 Desktop_in_files = gnome-ui-properties.desktop.in
 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = gnome-ui-properties.glade
 
-INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)	-DGNOMELOCALEDIR="\"$(datadir)/locale\""
+INCLUDES = \
+	$(GNOMECC_CAPPLETS_CFLAGS) \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
 EXTRA_DIST = $(Glade_DATA)
diff --git a/capplets/ui-properties/gnome-ui-properties.c b/capplets/ui-properties/gnome-ui-properties.c
index aee3d8dec..aefe23432 100644
--- a/capplets/ui-properties/gnome-ui-properties.c
+++ b/capplets/ui-properties/gnome-ui-properties.c
@@ -89,7 +89,7 @@ create_dialog (void)
 {
   GladeXML *dialog;
 
-  dialog = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
+  dialog = glade_xml_new (GNOMECC_GLADE_DIR "/gnome-ui-properties.glade", "gnome_ui_properties_dialog", NULL);
   return dialog;
 }
 
diff --git a/capplets/url-properties/Makefile.am b/capplets/url-properties/Makefile.am
index ad13a5088..cdc4c4703 100644
--- a/capplets/url-properties/Makefile.am
+++ b/capplets/url-properties/Makefile.am
@@ -16,9 +16,9 @@ pixmap_DATA =
 INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
 EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
-iconsdir   = $(GNOMECC_ICONS_DIR)
-Gladedir   = $(GNOMECC_GLADE_DIR)
-pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+iconsdir   = $(pkgdatadir)/icons
+Gladedir   = $(pkgdatadir)/glade
+pixmapdir  = $(pkgdatadir)/pixmaps
 Glade_DATA = $(cappletname)-properties.glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am
index 1d8247e9e..4e5556d33 100644
--- a/capplets/windows/Makefile.am
+++ b/capplets/windows/Makefile.am
@@ -8,7 +8,7 @@ gnome_window_properties_SOURCES = 		\
 
 @INTLTOOL_DESKTOP_RULE@
 
-gladedir   = $(GNOMECC_GLADE_DIR)
+gladedir   = $(pkgdatadir)/glade
 glade_DATA = gnome-window-properties.glade
 
 desktopdir = $(datadir)/applications
diff --git a/capplets/wm-properties/wm-desktops/Makefile.am b/capplets/wm-properties/wm-desktops/Makefile.am
index 18bf50b46..8621046a2 100644
--- a/capplets/wm-properties/wm-desktops/Makefile.am
+++ b/capplets/wm-properties/wm-desktops/Makefile.am
@@ -15,7 +15,7 @@ wmdata_DATA = $(desktop_files)
 EXTRA_DIST = $(desktop_in_in_files)
 
 $(desktop_in_files): %.desktop.in: %.desktop.in.in
-	    sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
+	    sed s#Icon=#Icon=$(pkgdatadir)/icons/# < $< > $@
 
 $(desktop_files): %.desktop: %.desktop.in
 	$(top_builddir)/intltool-merge -d $(top_srcdir)/po $< $@
diff --git a/configure.in b/configure.in
index d17177cba..c48ae8e41 100644
--- a/configure.in
+++ b/configure.in
@@ -364,20 +364,6 @@ dnl ==============================================
 dnl End: Check that we meet the  dependencies
 dnl ==============================================
 
-dnl ==============================================
-dnl IDL settings
-dnl ==============================================
-
-# orbit-idl
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-AC_SUBST(ORBIT_IDL)
-
-# idl directories
-LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(LIBBONOBO_IDL_DIR)
-BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
-
 AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
 
 if test x"$GDK_PIXBUF_CSOURCE" = xno; then
@@ -544,37 +530,6 @@ dnl ==============================================
 dnl End: Define the main variables
 dnl ==============================================
 
-ORBIT_IDL="`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`"
-AC_SUBST(ORBIT_IDL)
-
-LIBBONOBO_IDL_DIR="`$PKG_CONFIG --variable=idldir libbonobo-2.0`"
-AC_SUBST(LIBBONOBO_IDL_DIR)
-
-BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
-AC_SUBST(BONOBO_ACTIVATION_IDL_DIR)
-
-
-dnl ==============================================
-dnl Define the directories 
-dnl ==============================================
-if test "x${prefix}" = "xNONE"; then
-  real_prefix=${ac_default_prefix}
-else
-  real_prefix=${prefix}
-fi
-
-AC_DEFINE_UNQUOTED(GNOMECC_DATA_DIR, "${real_prefix}/share/${GETTEXT_PACKAGE}",[Path to gnomecc data files])
-AC_DEFINE_UNQUOTED(PREFIX, "$prefix", [install prefix])
-GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons'
-AC_SUBST(GNOMECC_ICONS_DIR)
-GNOMECC_GLADE_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/interfaces'
-AC_SUBST(GNOMECC_GLADE_DIR)
-GNOMECC_PIXMAPS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/pixmaps'
-AC_SUBST(GNOMECC_PIXMAPS_DIR)
-dnl ==============================================
-dnl End: Define the directories 
-dnl ==============================================
-
 dnl =======================================
 dnl Variables for config_archiverConf.sh.in
 dnl =======================================
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index 13433ec5e..ceb9206b3 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -1,10 +1,17 @@
 SUBDIRS = xrdb actions
 
-INCLUDES=$(DBUS_CFLAGS) $(LIBGNOMEKBD_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \
-  -DDATADIR="\"$(datadir)\""			\
-  -DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\""	\
-  -DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-  $(FB_CFLAGS)
+INCLUDES= \
+	$(DBUS_CFLAGS)					\
+	$(LIBGNOMEKBD_CFLAGS)				\
+	$(GNOME_SETTINGS_DAEMON_CFLAGS)			\
+	$(FB_CFLAGS)					\
+	-I$(top_srcdir)/libbackground			\
+	-I$(top_srcdir)					\
+	-DDATADIR="\"$(datadir)\""			\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
+	-DGNOMECC_GLADE_DIR="\"$(pkgdatadir)/glade\""	\
+	-DGNOMECC_PIXMAPS_DIR="\"$(pkgdatadir)/pixmaps\""
 
 libexec_PROGRAMS=gnome-settings-daemon
 
@@ -92,7 +99,7 @@ BUILT_SOURCES=gnome-settings-server.h		\
 
 gnome_settings_daemon_SOURCES+=$(BUILT_SOURCES)
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = modmap-dialog.glade
 
 Dbusapidir   = $(includedir)/gnome-settings-daemon-2.0/gnome-settings-daemon
diff --git a/gnome-settings-daemon/actions/Makefile.am b/gnome-settings-daemon/actions/Makefile.am
index 3085ce43c..ef943e049 100644
--- a/gnome-settings-daemon/actions/Makefile.am
+++ b/gnome-settings-daemon/actions/Makefile.am
@@ -25,10 +25,10 @@ endif # HAVE_OSS
 endif # HAVE_ALSA
 endif # HAVE_GSTREAMER
 
-Datadir = $(datadir)/control-center-2.0/interfaces/
+Datadir = $(pkgdatadir)/glade
 Data_DATA = acme.glade
 
-pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
+pixmapsdir = $(pkgdatadir)/pixmaps
 pixmaps_DATA = acme-eject.png
 
 EXTRA_DIST =					\
diff --git a/gnome-settings-daemon/gnome-settings-xmodmap.c b/gnome-settings-daemon/gnome-settings-xmodmap.c
index 607b9ab40..a28e219a5 100644
--- a/gnome-settings-daemon/gnome-settings-xmodmap.c
+++ b/gnome-settings-daemon/gnome-settings-xmodmap.c
@@ -263,7 +263,7 @@ gnome_settings_modmap_dialog_call (void)
 	homeDir = g_dir_open (g_get_home_dir (), 0, NULL);
 	if (homeDir == NULL)
 		return;
-	xml = glade_xml_new (GNOMECC_DATA_DIR "/interfaces/modmap-dialog.glade", "dialog1", NULL);
+	xml = glade_xml_new (GNOMECC_GLADE_DIR "/modmap-dialog.glade", "dialog1", NULL);
 
 	if (! xml) {
 		g_warning ("Could not find  GLADE_FILE \n");
diff --git a/gnome-settings-daemon/gnome-settings-xrdb.c b/gnome-settings-daemon/gnome-settings-xrdb.c
index 52152d672..59dc9d3cd 100644
--- a/gnome-settings-daemon/gnome-settings-xrdb.c
+++ b/gnome-settings-daemon/gnome-settings-xrdb.c
@@ -2,7 +2,7 @@
 
 /* gnome-settings-xrdb.c
  *
- * Copyright © 2003 Ross Burton
+ * Copyright © 2003 Ross Burton
  *
  * Written by Ross Burton <ross@burtonini.com>
  *
@@ -32,7 +32,7 @@
 #include "gnome-settings-daemon.h"
 #include "gnome-settings-xrdb.h"
 
-#define SYSTEM_AD_DIR DATADIR "/control-center-2.0/xrdb"
+#define SYSTEM_AD_DIR GNOMECC_DATA_DIR "/xrdb"
 #define GENERAL_AD SYSTEM_AD_DIR "/General.ad"
 #define USER_AD_DIR ".gnome2/xrdb"
 #define USER_X_RESOURCES ".Xresources"
diff --git a/gnome-settings-daemon/gsd-media-keys-window.c b/gnome-settings-daemon/gsd-media-keys-window.c
index 8fcf69a39..c136994e0 100644
--- a/gnome-settings-daemon/gsd-media-keys-window.c
+++ b/gnome-settings-daemon/gsd-media-keys-window.c
@@ -164,7 +164,7 @@ action_changed (GsdMediaKeysWindow *window)
 			break;
 		case GSD_MEDIA_KEYS_WINDOW_ACTION_EJECT:
 			volume_controls_set_visible (window, FALSE);
-			window_set_icon_file (window, PIXMAPSDIR "/acme-eject.png");
+			window_set_icon_file (window, GNOMECC_PIXMAPS_DIR "/acme-eject.png");
 			break;
 		default:
 			break;
@@ -611,7 +611,7 @@ gsd_media_keys_window_init (GsdMediaKeysWindow *window)
 	} else {
 		GtkWidget *vbox;
 
-		window->priv->xml = glade_xml_new (DATADIR "/control-center-2.0/interfaces/acme.glade", "acme_vbox", NULL);
+		window->priv->xml = glade_xml_new (GNOMECC_GLADE_DIR "/acme.glade", "acme_vbox", NULL);
 
 		vbox = glade_xml_get_widget (window->priv->xml, "acme_vbox");
 		if (vbox != NULL) {
diff --git a/gnome-settings-daemon/xrdb/Makefile.am b/gnome-settings-daemon/xrdb/Makefile.am
index 6b2aa5d0d..1a7d8a4bd 100644
--- a/gnome-settings-daemon/xrdb/Makefile.am
+++ b/gnome-settings-daemon/xrdb/Makefile.am
@@ -1,4 +1,4 @@
-xrdbdir = $(datadir)/control-center-2.0/xrdb
+xrdbdir = $(pkgdatadir)/xrdb
 xrdb_DATA = \
 	General.ad \
 	Editres.ad \
diff --git a/typing-break/Makefile.am b/typing-break/Makefile.am
index 99db04326..b64a4ced4 100644
--- a/typing-break/Makefile.am
+++ b/typing-break/Makefile.am
@@ -15,7 +15,7 @@ gnome_typing_monitor_SOURCES =			\
 
 gnome_typing_monitor_CPPFLAGS = \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
-	-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\"		\
+	-DIMAGEDIR=\"$(pkgdatadir)/pixmaps\"		\
 	$(AM_CPPFLAGS)
 gnome_typing_monitor_CFLAGS = \
 	@GNOME_CFLAGS@	\
@@ -24,7 +24,7 @@ gnome_typing_monitor_CFLAGS = \
 gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@
 gnome_typing_monitor_LDFLAGS = -export-dynamic
 
-imagedir = $(GNOMECC_PIXMAPS_DIR)
+imagedir = $(pkgdatadir)/pixmaps
 image_DATA = stop.png bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png
 
 # Themeable application icon
diff --git a/vfs-methods/themus/Makefile.am b/vfs-methods/themus/Makefile.am
index 7fc99df51..4d2498f33 100644
--- a/vfs-methods/themus/Makefile.am
+++ b/vfs-methods/themus/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \
   $(THEMUS_COMPONENT_CFLAGS) \
   $(THEMUS_APPLIER_CFLAGS) \
   -I$(top_srcdir)/capplets/common \
-  -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \
+  -DGNOMECC_GLADE_DIR=\"$(pkgdatadir)/glade\" \
   -DDIRECTORY_DIR=\"$(directorydir)\" \
   -DDATA_DIR=\"$(datadir)/themus\" \
   -DGNOMELOCALEDIR=\"$(datadir)/locale\"
@@ -41,7 +41,7 @@ libnautilus_themus_la_SOURCES = \
 	themus-properties-view.h \
 	themus-properties-main.c
 
-Gladedir   = $(GNOMECC_GLADE_DIR)
+Gladedir   = $(pkgdatadir)/glade
 Glade_DATA = apply-font.glade
 
 @INTLTOOL_DIRECTORY_RULE@