Remove librsvg.

* Makefile.am: Remove librsvg. * librsvg/.cvsignore: * librsvg/Makefile.am: * librsvg/art_render.c: * librsvg/art_render.h: * librsvg/art_render_gradient.c: * librsvg/art_render_gradient.h: * librsvg/art_render_mask.c: * librsvg/art_render_mask.h: * librsvg/art_render_svp.c: * librsvg/art_render_svp.h: * librsvg/art_rgba.c: * librsvg/art_rgba.h: * librsvg/example-nested-transform.svg: * librsvg/makefile-simple: * librsvg/opacity.svg: * librsvg/rsvg-bpath-util.c: * librsvg/rsvg-bpath-util.h: * librsvg/rsvg-css.c: * librsvg/rsvg-css.h: * librsvg/rsvg-defs.c: * librsvg/rsvg-defs.h: * librsvg/rsvg-ft.c: * librsvg/rsvg-ft.h: * librsvg/rsvg-paint-server.c: * librsvg/rsvg-paint-server.h: * librsvg/rsvg-path.c: * librsvg/rsvg-path.h: * librsvg/rsvg.c: * librsvg/rsvg.h: * librsvg/subpixel-text-test: * librsvg/test-ft-gtk.c: * librsvg/test-ft.c: * librsvg/test-rsvg.c: * librsvg/test.svg: Move librsvg to its own top level GNOME CVS module. * configure.in: Add librsvg and eel dependencies. Remove librsvg and font entries. * nautilus.spec.in: Remove font entries. Add librsvg and eel requirements. * data/Makefile.am: * data/fonts/.cvsignore: * data/fonts/Makefile.am: * data/fonts/urw/.cvsignore: * data/fonts/urw/Makefile.am: * data/fonts/urw/README: * data/fonts/urw/fonts.dir: * data/fonts/urw/n019003l.afm: * data/fonts/urw/n019003l.pfb: * data/fonts/urw/n019003l.pfm: * data/fonts/urw/n019004l.afm: * data/fonts/urw/n019004l.pfb: * data/fonts/urw/n019004l.pfm: * data/fonts/urw/n019023l.afm: * data/fonts/urw/n019023l.pfb: * data/fonts/urw/n019023l.pfm: * data/fonts/urw/n019024l.afm: * data/fonts/urw/n019024l.pfb: * data/fonts/urw/n019024l.pfm: Retire default fonts. These now live in eel. * libnautilus/nautilus-undo-transaction.c: (nautilus_undo_transaction_destroy): * libnautilus/nautilus-view.c: (nautilus_view_destroy): Update for eel changes. Use eel-gtk-macros. * nautilus-installer/src/nautilus-druid-page-eazel.c: (nautilus_druid_page_eazel_destroy), (nautilus_druid_page_eazel_finalize), (nautilus_druid_page_eazel_size_allocate), (nautilus_druid_page_eazel_size_request): Update for eel changes. Use eel-gtk-macros. * libnautilus-extensions/Makefile.am: * libnautilus-extensions/nautilus-bonobo-extensions.c: * libnautilus-extensions/nautilus-bonobo-extensions.h: * libnautilus-extensions/nautilus-bookmark.c: * libnautilus-extensions/nautilus-ctree.c: * libnautilus-extensions/nautilus-customization-data.c: * libnautilus-extensions/nautilus-dateedit-extensions.c: * libnautilus-extensions/nautilus-dateedit-extensions.h: * libnautilus-extensions/nautilus-directory-async.c: * libnautilus-extensions/nautilus-directory-background.c: * libnautilus-extensions/nautilus-directory-background.h: * libnautilus-extensions/nautilus-directory-metafile-monitor.c: * libnautilus-extensions/nautilus-directory-metafile.c: * libnautilus-extensions/nautilus-directory.c: * libnautilus-extensions/nautilus-drag-window.c: * libnautilus-extensions/nautilus-drag.c: * libnautilus-extensions/nautilus-druid-page-eazel.c: * libnautilus-extensions/nautilus-druid.c: * libnautilus-extensions/nautilus-entry.c: * libnautilus-extensions/nautilus-file-changes-queue.c: * libnautilus-extensions/nautilus-file-operations-progress.c: * libnautilus-extensions/nautilus-file-operations.c: * libnautilus-extensions/nautilus-file-private.h: * libnautilus-extensions/nautilus-file-utilities.c: * libnautilus-extensions/nautilus-file.c: * libnautilus-extensions/nautilus-font-factory.c: * libnautilus-extensions/nautilus-gconf-extensions.c: * libnautilus-extensions/nautilus-generous-bin.c: * libnautilus-extensions/nautilus-global-preferences.c: * libnautilus-extensions/nautilus-global-preferences.h: * libnautilus-extensions/nautilus-horizontal-splitter.c: * libnautilus-extensions/nautilus-icon-canvas-item.c: * libnautilus-extensions/nautilus-icon-canvas-item.h: * libnautilus-extensions/nautilus-icon-container.c: * libnautilus-extensions/nautilus-icon-container.h: * libnautilus-extensions/nautilus-icon-dnd.c: * libnautilus-extensions/nautilus-icon-factory.c: * libnautilus-extensions/nautilus-icon-factory.h: * libnautilus-extensions/nautilus-icon-private.h: * libnautilus-extensions/nautilus-icon-text-item.c: * libnautilus-extensions/nautilus-keep-last-vertical-box.c: * libnautilus-extensions/nautilus-lib-self-check-functions.c: * libnautilus-extensions/nautilus-lib-self-check-functions.h: * libnautilus-extensions/nautilus-link-set.c: * libnautilus-extensions/nautilus-link.c: * libnautilus-extensions/nautilus-list-column-title.c: * libnautilus-extensions/nautilus-list.c: * libnautilus-extensions/nautilus-medusa-support.c: * libnautilus-extensions/nautilus-merged-directory.c: * libnautilus-extensions/nautilus-metafile-factory.c: * libnautilus-extensions/nautilus-metafile.c: * libnautilus-extensions/nautilus-mime-actions.c: * libnautilus-extensions/nautilus-preferences-box.c: * libnautilus-extensions/nautilus-preferences-dialog.c: * libnautilus-extensions/nautilus-preferences-group.c: * libnautilus-extensions/nautilus-preferences-item.c: * libnautilus-extensions/nautilus-preferences-pane.c: * libnautilus-extensions/nautilus-preferences.c: * libnautilus-extensions/nautilus-preferences.h: * libnautilus-extensions/nautilus-program-chooser.c: * libnautilus-extensions/nautilus-program-choosing.c: * libnautilus-extensions/nautilus-program-choosing.h: * libnautilus-extensions/nautilus-search-uri.c: * libnautilus-extensions/nautilus-sidebar-functions.c: * libnautilus-extensions/nautilus-tabs.c: * libnautilus-extensions/nautilus-theme.c: * libnautilus-extensions/nautilus-thumbnails.c: * libnautilus-extensions/nautilus-trash-directory.c: * libnautilus-extensions/nautilus-trash-file.c: * libnautilus-extensions/nautilus-trash-monitor.c: * libnautilus-extensions/nautilus-undo-context.c: * libnautilus-extensions/nautilus-undo-manager.c: * libnautilus-extensions/nautilus-undo-signal-handlers.c: * libnautilus-extensions/nautilus-vfs-directory.c: * libnautilus-extensions/nautilus-vfs-file.c: * libnautilus-extensions/nautilus-view-identifier.c: * libnautilus-extensions/nautilus-volume-monitor.c: Use new eel library. * libnautilus-extensions/nautilus-art-extensions.c: * libnautilus-extensions/nautilus-art-extensions.h: * libnautilus-extensions/nautilus-art-gtk-extensions.c: * libnautilus-extensions/nautilus-art-gtk-extensions.h: * libnautilus-extensions/nautilus-background-canvas-group.c: * libnautilus-extensions/nautilus-background-canvas-group.h: * libnautilus-extensions/nautilus-background.c: * libnautilus-extensions/nautilus-background.h: * libnautilus-extensions/nautilus-caption-table.c: * libnautilus-extensions/nautilus-caption-table.h: * libnautilus-extensions/nautilus-caption.c: * libnautilus-extensions/nautilus-caption.h: * libnautilus-extensions/nautilus-clickable-image.c: * libnautilus-extensions/nautilus-clickable-image.h: * libnautilus-extensions/nautilus-debug-drawing.c: * libnautilus-extensions/nautilus-debug-drawing.h: * libnautilus-extensions/nautilus-debug.c: * libnautilus-extensions/nautilus-debug.h: * libnautilus-extensions/nautilus-ellipsizing-label.c: * libnautilus-extensions/nautilus-ellipsizing-label.h: * libnautilus-extensions/nautilus-enumeration.c: * libnautilus-extensions/nautilus-enumeration.h: * libnautilus-extensions/nautilus-font-manager.c: * libnautilus-extensions/nautilus-font-manager.h: * libnautilus-extensions/nautilus-font-picker.c: * libnautilus-extensions/nautilus-font-picker.h: * libnautilus-extensions/nautilus-gdk-extensions.c: * libnautilus-extensions/nautilus-gdk-extensions.h: * libnautilus-extensions/nautilus-gdk-font-extensions.c: * libnautilus-extensions/nautilus-gdk-font-extensions.h: * libnautilus-extensions/nautilus-gdk-pixbuf-extensions.c: * libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h: * libnautilus-extensions/nautilus-glib-extensions.c: * libnautilus-extensions/nautilus-glib-extensions.h: * libnautilus-extensions/nautilus-glyph.c: * libnautilus-extensions/nautilus-glyph.h: * libnautilus-extensions/nautilus-gnome-extensions.c: * libnautilus-extensions/nautilus-gnome-extensions.h: * libnautilus-extensions/nautilus-graphic-effects.c: * libnautilus-extensions/nautilus-graphic-effects.h: * libnautilus-extensions/nautilus-gtk-extensions.c: * libnautilus-extensions/nautilus-gtk-extensions.h: * libnautilus-extensions/nautilus-gtk-macros.h: * libnautilus-extensions/nautilus-image-table.c: * libnautilus-extensions/nautilus-image-table.h: * libnautilus-extensions/nautilus-image-with-background.c: * libnautilus-extensions/nautilus-image-with-background.h: * libnautilus-extensions/nautilus-image.c: * libnautilus-extensions/nautilus-image.h: * libnautilus-extensions/nautilus-label-with-background.c: * libnautilus-extensions/nautilus-label-with-background.h: * libnautilus-extensions/nautilus-label.c: * libnautilus-extensions/nautilus-label.h: * libnautilus-extensions/nautilus-labeled-image.c: * libnautilus-extensions/nautilus-labeled-image.h: * libnautilus-extensions/nautilus-lib-self-check-functions.c: * libnautilus-extensions/nautilus-lib-self-check-functions.h: * libnautilus-extensions/nautilus-password-dialog.c: * libnautilus-extensions/nautilus-password-dialog.h: * libnautilus-extensions/nautilus-radio-button-group.c: * libnautilus-extensions/nautilus-radio-button-group.h: * libnautilus-extensions/nautilus-region.c: * libnautilus-extensions/nautilus-region.h: * libnautilus-extensions/nautilus-scalable-font-private.h: * libnautilus-extensions/nautilus-scalable-font.c: * libnautilus-extensions/nautilus-scalable-font.h: * libnautilus-extensions/nautilus-self-checks.c: * libnautilus-extensions/nautilus-self-checks.h: * libnautilus-extensions/nautilus-smooth-text-layout-cache.c: * libnautilus-extensions/nautilus-smooth-text-layout-cache.h: * libnautilus-extensions/nautilus-smooth-text-layout.c: * libnautilus-extensions/nautilus-smooth-text-layout.h: * libnautilus-extensions/nautilus-smooth-widget.c: * libnautilus-extensions/nautilus-smooth-widget.h: * libnautilus-extensions/nautilus-stock-dialogs.c: * libnautilus-extensions/nautilus-stock-dialogs.h: * libnautilus-extensions/nautilus-string-list.c: * libnautilus-extensions/nautilus-string-list.h: * libnautilus-extensions/nautilus-string-map.c: * libnautilus-extensions/nautilus-string-map.h: * libnautilus-extensions/nautilus-string-picker.c: * libnautilus-extensions/nautilus-string-picker.h: * libnautilus-extensions/nautilus-string.c: * libnautilus-extensions/nautilus-string.h: * libnautilus-extensions/nautilus-text-caption.c: * libnautilus-extensions/nautilus-text-caption.h: * libnautilus-extensions/nautilus-viewport.c: * libnautilus-extensions/nautilus-viewport.h: * libnautilus-extensions/nautilus-wrap-table.c: * libnautilus-extensions/nautilus-wrap-table.h: * libnautilus-extensions/nautilus-xml-extensions.c: * libnautilus-extensions/nautilus-xml-extensions.h: Remove these files. These are all part of eel now. * applets/launcher/nautilus-launcher-applet.c: * applets/preferences-applet/nautilus-preferences-applet.c: * components/adapter/Makefile.am: * components/adapter/main.c: * components/adapter/nautilus-adapter-control-embed-strategy.c: * components/adapter/nautilus-adapter-embed-strategy.c: * components/adapter/nautilus-adapter-embeddable-embed-strategy.c: * components/adapter/nautilus-adapter-factory-server.c: * components/adapter/nautilus-adapter-file-load-strategy.c: * components/adapter/nautilus-adapter-load-strategy.c: * components/adapter/nautilus-adapter-progressive-load-strategy.c: * components/adapter/nautilus-adapter-stream-load-strategy.c: * components/adapter/nautilus-adapter.c: * components/hardware/Makefile.am: * components/hardware/nautilus-hardware-view.c: * components/help/Makefile.am: * components/help/help-method.c: * components/help/hyperbola-filefmt.c: * components/help/hyperbola-nav-tree.c: * components/history/Makefile.am: * components/history/nautilus-history-view.c: * components/image-viewer/Makefile.am: * components/image-viewer/nautilus-image-view.c: * components/loser/content/Makefile.am: * components/loser/content/nautilus-content-loser.c: * components/loser/sidebar/Makefile.am: * components/loser/sidebar/nautilus-sidebar-loser.c: * components/mozilla/Makefile.am: * components/mozilla/bonobo-extensions.c: * components/mozilla/nautilus-mozilla-content-view.c: * components/music/Makefile.am: * components/music/nautilus-music-view.c: * components/notes/Makefile.am: * components/notes/nautilus-notes.c: * components/rpmview/Makefile.am: * components/rpmview/nautilus-rpm-verify-window.c: * components/rpmview/nautilus-rpm-view-install.c: * components/rpmview/nautilus-rpm-view.c: * components/sample/nautilus-sample-content-view.c: * components/services/install-view/Makefile.am: * components/services/install-view/callbacks.c: * components/services/install-view/forms.c: * components/services/install-view/nautilus-service-install-view.c: * components/services/install/lib/eazel-install-logic2.c: * components/services/install/server/main.c: * components/services/inventory-view/Makefile.am: * components/services/inventory-view/nautilus-inventory-config-page .c: * components/services/inventory-view/nautilus-inventory-disable-pag * components/services/inventory-view/nautilus-inventory-enable-page * components/services/inventory-view/nautilus-inventory-view.c: * components/services/inventory/Makefile.am: * components/services/inventory/eazel-inventory-upload-callback.c: * components/services/inventory/eazel-inventory.c: * components/services/inventory/main.c: * components/services/login/nautilus-view/Makefile.am: * components/services/login/nautilus-view/nautilus-change-password- view.c: * components/services/login/nautilus-view/password-box.c: * components/services/nautilus-dependent-shared/Makefile.am: * components/services/nautilus-dependent-shared/eazel-services-exte nsions.c: * components/services/nautilus-dependent-shared/eazel-services-exte nsions.h: * components/services/nautilus-dependent-shared/eazel-services-foot er.c: * components/services/nautilus-dependent-shared/eazel-services-head er.c: * components/services/nautilus-dependent-shared/test-footer-header. c: * components/services/summary/Makefile.am: * components/services/summary/nautilus-summary-callbacks.c: * components/services/summary/nautilus-summary-dialogs.c: * components/services/summary/nautilus-summary-dialogs.h: * components/services/summary/nautilus-summary-footer.c: * components/services/summary/nautilus-summary-menu-items.c: * components/services/summary/nautilus-summary-view-private.h: * components/services/summary/nautilus-summary-view.c: * components/services/time/nautilus-view/main.c: * components/services/time/nautilus-view/trilobite-eazel-time-view. c: * components/services/trilobite/sample/nautilus-view/Makefile.am: * components/text/Makefile.am: * components/text/nautilus-text-view.c: * components/throbber/Makefile.am: * components/throbber/main.c: * components/throbber/nautilus-throbber.c: * components/tree/Makefile.am: * components/tree/nautilus-tree-change-queue.c: * components/tree/nautilus-tree-expansion-state.c: * components/tree/nautilus-tree-model.c: * components/tree/nautilus-tree-node.c: * components/tree/nautilus-tree-view-dnd.c: * components/tree/nautilus-tree-view.c: * helper-utilities/authenticate/Makefile.am: * helper-utilities/authenticate/nautilus-authenticate.c: * nautilus-installer/src/nautilus-druid.c: * src/Makefile.am: * src/file-manager/fm-desktop-icon-view.c: * src/file-manager/fm-directory-view.c: * src/file-manager/fm-directory-view.h: * src/file-manager/fm-error-reporting.c: * src/file-manager/fm-icon-text-window.c: * src/file-manager/fm-icon-view.c: * src/file-manager/fm-list-view.c: * src/file-manager/fm-properties-window.c: * src/file-manager/fm-search-list-view.c: * src/file-manager/nautilus-indexing-info.c: * src/nautilus-about.c: * src/nautilus-application.c: * src/nautilus-bookmark-list.c: * src/nautilus-bookmark-parsing.c: * src/nautilus-bookmarks-window.c: * src/nautilus-complex-search-bar.c: * src/nautilus-component-adapter-factory.c: * src/nautilus-desktop-window.c: * src/nautilus-first-time-druid.c: * src/nautilus-link-set-window.c: * src/nautilus-location-bar.c: * src/nautilus-main.c: * src/nautilus-navigation-bar.c: * src/nautilus-profiler.c: * src/nautilus-property-browser.c: * src/nautilus-search-bar-criterion.c: * src/nautilus-search-bar.c: * src/nautilus-shell.c: * src/nautilus-sidebar-tabs.c: * src/nautilus-sidebar-title.c: * src/nautilus-sidebar.c: * src/nautilus-signaller.c: * src/nautilus-simple-search-bar.c: * src/nautilus-switchable-navigation-bar.c: * src/nautilus-switchable-search-bar.c: * src/nautilus-theme-selector.c: * src/nautilus-view-frame-corba.c: * src/nautilus-view-frame.c: * src/nautilus-window-manage-views.c: * src/nautilus-window-menus.c: * src/nautilus-window-toolbars.c: * src/nautilus-window.c: * src/nautilus-window.h: * src/nautilus-zoom-control.c: Update for new eel library usage. * test/test-nautilus-background.c: * test/test-nautilus-clickable-image.c: * test/test-nautilus-font-manager.c: * test/test-nautilus-font-picker.c: * test/test-nautilus-font-simple.c: * test/test-nautilus-font.c: * test/test-nautilus-glyph-simple.c: * test/test-nautilus-glyph.c: * test/test-nautilus-image-background.c: * test/test-nautilus-image-scrolled.c: * test/test-nautilus-image-simple.c: * test/test-nautilus-image-table.c: * test/test-nautilus-image-tile.c: * test/test-nautilus-image.c: * test/test-nautilus-label-background.c: * test/test-nautilus-label-flavorful.c: * test/test-nautilus-label-offset.c: * test/test-nautilus-label-scrolled.c: * test/test-nautilus-label-simple.c: * test/test-nautilus-label-wrapped.c: * test/test-nautilus-label.c: * test/test-nautilus-labeled-image.c: * test/test-nautilus-password-dialog.c: * test/test-nautilus-pixbuf-tile.c: * test/test-nautilus-smooth-text-layout.c: * test/test-nautilus-viewport-constraint.c: * test/test-nautilus-widgets.c: Remove these. They live in eel now. * test/vsignore: * test/kefile.am: * test/st-nautilus-preferences-change.c: * test/st-nautilus-preferences-display.c: * test/st-nautilus-wrap-table.c: * test/st.c: * test/st.h: Update for new eel library usage.
author: Ramiro Estrugo <ramiro@src.gnome.org> 2001-04-04 00:07:15 +0000
committer: Ramiro Estrugo <ramiro@src.gnome.org> 2001-04-04 00:07:15 +0000
commit: fbbaf803620a6a7cf4598b0b59406718da6fc778 (patch)
tree: 5771ffd1b01df76f1837270f5f6f57f5092f20e9 /components
parent: 9f9bfe2e5ff03c6829b4b8730b65cdc00051331d (diff)
download: nautilus-fbbaf803620a6a7cf4598b0b59406718da6fc778.tar.gz
84 files changed, 715 insertions, 634 deletions
diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am
index 46534c979..9d75b89c8 100644
--- a/components/adapter/Makefile.am
+++ b/components/adapter/Makefile.am
@@ -5,6 +5,8 @@ INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Nautilus-Adapter\"	\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir) -I$(top_builddir) -I.	\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)			\
 	$(BONOBOX_CFLAGS)			\
 	$(OAF_CFLAGS)				\
@@ -58,6 +60,8 @@ nautilus_adapter_LDADD =							\
 	$(top_builddir)/libnautilus/libnautilus.la				\
 	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la		\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)								\
 	$(OAF_LIBS)								\
 	$(BONOBO_PRINT_LIBS)							\
diff --git a/components/adapter/main.c b/components/adapter/main.c
index 958191d94..31153f595 100644
--- a/components/adapter/main.c
+++ b/components/adapter/main.c
@@ -35,7 +35,7 @@
 #include <gtk/gtkmain.h>
 #include <gtk/gtksignal.h>
 #include <libgnomevfs/gnome-vfs-init.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <liboaf/liboaf.h>
 #include <stdlib.h>
 
@@ -93,7 +93,7 @@ main (int argc, char *argv[])
 	char *registration_id;
 
 	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		nautilus_make_warnings_and_criticals_stop_in_debugger
+		eel_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", "ORBit", NULL);
 	}
 	
diff --git a/components/adapter/nautilus-adapter-control-embed-strategy.c b/components/adapter/nautilus-adapter-control-embed-strategy.c
index d7d4c8636..97b6bf1a3 100644
--- a/components/adapter/nautilus-adapter-control-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-control-embed-strategy.c
@@ -36,7 +36,7 @@
 
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <bonobo/bonobo-control.h>
 
 
@@ -58,7 +58,7 @@ static GtkWidget *nautilus_adapter_control_embed_strategy_get_widget (NautilusAd
 static BonoboObject *nautilus_adapter_control_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterControlEmbedStrategy, nautilus_adapter_control_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterControlEmbedStrategy, nautilus_adapter_control_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
 
 
 static void
@@ -98,7 +98,7 @@ nautilus_adapter_control_embed_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void 
diff --git a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
index bc9d885db..6fcef3cf0 100644
--- a/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-control-factory-embed-strategy.c
@@ -37,7 +37,7 @@
 #include <bonobo/bonobo-client-site.h>
 #include <bonobo/bonobo-item-container.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 
 struct NautilusAdapterEmbeddableEmbedStrategyDetails {
@@ -61,7 +61,7 @@ static GtkWidget *nautilus_adapter_embeddable_embed_strategy_get_widget (Nautilu
 static BonoboObject *nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
 
 
 static void
@@ -107,7 +107,7 @@ nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter-embed-strategy.c b/components/adapter/nautilus-adapter-embed-strategy.c
index f2739accc..552d3c0e9 100644
--- a/components/adapter/nautilus-adapter-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-embed-strategy.c
@@ -36,7 +36,7 @@
 #include "nautilus-adapter-embeddable-embed-strategy.h"
 #include <gtk/gtkobject.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 
 enum {
@@ -51,12 +51,12 @@ static guint signals[LAST_SIGNAL];
 static void nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyClass *klass);
 static void nautilus_adapter_embed_strategy_initialize       (NautilusAdapterEmbedStrategy      *strategy);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbedStrategy,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbedStrategy,
 				   nautilus_adapter_embed_strategy,
 				   GTK_TYPE_OBJECT)
 
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_widget)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_zoomable)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_widget)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_embed_strategy, get_zoomable)
 
 static void
 nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyClass *klass)
@@ -89,8 +89,8 @@ nautilus_adapter_embed_strategy_initialize_class (NautilusAdapterEmbedStrategyCl
 	
 	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
 	
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_widget);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_zoomable);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_widget);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_embed_strategy, get_zoomable);
 }
 
 static void
@@ -136,7 +136,7 @@ nautilus_adapter_embed_strategy_get (Bonobo_Unknown component)
 GtkWidget *
 nautilus_adapter_embed_strategy_get_widget (NautilusAdapterEmbedStrategy *strategy)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy,
 		 get_widget, (strategy));
 }
@@ -144,7 +144,7 @@ nautilus_adapter_embed_strategy_get_widget (NautilusAdapterEmbedStrategy *strate
 BonoboObject *
 nautilus_adapter_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy)
 {
-	return NAUTILUS_CALL_METHOD_WITH_RETURN_VALUE
+	return EEL_CALL_METHOD_WITH_RETURN_VALUE
 		(NAUTILUS_ADAPTER_EMBED_STRATEGY_CLASS, strategy,
 		 get_zoomable, (strategy));
 }
diff --git a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
index bc9d885db..6fcef3cf0 100644
--- a/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
+++ b/components/adapter/nautilus-adapter-embeddable-embed-strategy.c
@@ -37,7 +37,7 @@
 #include <bonobo/bonobo-client-site.h>
 #include <bonobo/bonobo-item-container.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 
 struct NautilusAdapterEmbeddableEmbedStrategyDetails {
@@ -61,7 +61,7 @@ static GtkWidget *nautilus_adapter_embeddable_embed_strategy_get_widget (Nautilu
 static BonoboObject *nautilus_adapter_embeddable_embed_strategy_get_zoomable (NautilusAdapterEmbedStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterEmbeddableEmbedStrategy, nautilus_adapter_embeddable_embed_strategy, NAUTILUS_TYPE_ADAPTER_EMBED_STRATEGY)
 
 
 static void
@@ -107,7 +107,7 @@ nautilus_adapter_embeddable_embed_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter-factory-server.c b/components/adapter/nautilus-adapter-factory-server.c
index 4c5f6119f..d1ce8a0d5 100644
--- a/components/adapter/nautilus-adapter-factory-server.c
+++ b/components/adapter/nautilus-adapter-factory-server.c
@@ -36,7 +36,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
 
@@ -84,7 +84,7 @@ static void nautilus_adapter_factory_server_initialize       (NautilusAdapterFac
 static void nautilus_adapter_factory_server_destroy          (GtkObject                      *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFactoryServer,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFactoryServer,
 				   nautilus_adapter_factory_server,
 				   BONOBO_OBJECT_TYPE)
 
@@ -121,7 +121,7 @@ nautilus_adapter_factory_server_initialize (NautilusAdapterFactoryServer *server
 static void
 nautilus_adapter_factory_server_destroy (GtkObject *object)
 {
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
diff --git a/components/adapter/nautilus-adapter-file-load-strategy.c b/components/adapter/nautilus-adapter-file-load-strategy.c
index 639d97373..ba586ab2b 100644
--- a/components/adapter/nautilus-adapter-file-load-strategy.c
+++ b/components/adapter/nautilus-adapter-file-load-strategy.c
@@ -33,7 +33,7 @@
 #include "nautilus-adapter-file-load-strategy.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus/nautilus-view.h>
 
@@ -53,7 +53,7 @@ static void nautilus_adapter_file_load_strategy_load_location (NautilusAdapterLo
 static void nautilus_adapter_file_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFileLoadStrategy, nautilus_adapter_file_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterFileLoadStrategy, nautilus_adapter_file_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
 
 
 static void
@@ -94,7 +94,7 @@ nautilus_adapter_file_load_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter-load-strategy.c b/components/adapter/nautilus-adapter-load-strategy.c
index 90fac934e..5a7c490af 100644
--- a/components/adapter/nautilus-adapter-load-strategy.c
+++ b/components/adapter/nautilus-adapter-load-strategy.c
@@ -36,8 +36,8 @@
 #include "nautilus-adapter-progressive-load-strategy.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
 
 
 
@@ -57,10 +57,10 @@ static void nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoad
 static void nautilus_adapter_load_strategy_initialize       (NautilusAdapterLoadStrategy      *strategy);
 static void nautilus_adapter_load_strategy_destroy          (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterLoadStrategy, nautilus_adapter_load_strategy, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterLoadStrategy, nautilus_adapter_load_strategy, GTK_TYPE_OBJECT)
 
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, load_location)
-NAUTILUS_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, stop_loading)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, load_location)
+EEL_IMPLEMENT_MUST_OVERRIDE_SIGNAL (nautilus_adapter_load_strategy, stop_loading)
 
 static void
 nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClass *klass)
@@ -71,8 +71,8 @@ nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClas
 
 	object_class->destroy = nautilus_adapter_load_strategy_destroy;
 
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, load_location);
-	NAUTILUS_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, stop_loading);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, load_location);
+	EEL_ASSIGN_MUST_OVERRIDE_SIGNAL (klass, nautilus_adapter_load_strategy, stop_loading);
 
 
 	signals[REPORT_LOAD_UNDERWAY] =
@@ -87,7 +87,7 @@ nautilus_adapter_load_strategy_initialize_class (NautilusAdapterLoadStrategyClas
 			       GTK_RUN_LAST,
 			       object_class->type,
 			       GTK_SIGNAL_OFFSET (NautilusAdapterLoadStrategyClass, report_load_progress),
-			       nautilus_gtk_marshal_NONE__DOUBLE,
+			       eel_gtk_marshal_NONE__DOUBLE,
 			       GTK_TYPE_NONE, 1, GTK_TYPE_DOUBLE);
 	signals[REPORT_LOAD_COMPLETE] =
 		gtk_signal_new ("report_load_complete",
@@ -120,7 +120,7 @@ nautilus_adapter_load_strategy_destroy (GtkObject *object)
 
 	strategy = NAUTILUS_ADAPTER_LOAD_STRATEGY (object);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -178,7 +178,7 @@ nautilus_adapter_load_strategy_load_location (NautilusAdapterLoadStrategy *strat
 {
 	g_return_if_fail (NAUTILUS_IS_ADAPTER_LOAD_STRATEGY (strategy));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
+	EEL_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
 			      load_location, (strategy, uri));
 }
 
@@ -188,7 +188,7 @@ nautilus_adapter_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strat
 
 	g_return_if_fail (NAUTILUS_IS_ADAPTER_LOAD_STRATEGY (strategy));
 
-	NAUTILUS_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
+	EEL_CALL_METHOD (NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS, strategy,
 			      stop_loading, (strategy));
 }
 
diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.c b/components/adapter/nautilus-adapter-progressive-load-strategy.c
index 2afe5d0b2..45673322b 100644
--- a/components/adapter/nautilus-adapter-progressive-load-strategy.c
+++ b/components/adapter/nautilus-adapter-progressive-load-strategy.c
@@ -33,7 +33,7 @@
 #include "nautilus-adapter-progressive-load-strategy.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <bonobo/Bonobo.h>
 
@@ -64,7 +64,7 @@ static void nautilus_adapter_progressive_load_strategy_load_location (NautilusAd
 static void nautilus_adapter_progressive_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_adapter_progressive_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_adapter_progressive_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
 
 
 static void
@@ -107,7 +107,7 @@ nautilus_adapter_progressive_load_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusAdapterLoadStrategy *
diff --git a/components/adapter/nautilus-adapter-stream-load-strategy.c b/components/adapter/nautilus-adapter-stream-load-strategy.c
index 99b6adfb2..1c79c2539 100644
--- a/components/adapter/nautilus-adapter-stream-load-strategy.c
+++ b/components/adapter/nautilus-adapter-stream-load-strategy.c
@@ -34,7 +34,7 @@
 #include "bonobo-stream-vfs.h"
 
 #include <gtk/gtkobject.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 
 struct NautilusAdapterStreamLoadStrategyDetails {
@@ -52,7 +52,7 @@ static void nautilus_adapter_stream_load_strategy_load_location (NautilusAdapter
 static void nautilus_adapter_stream_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strategy);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapterStreamLoadStrategy, nautilus_adapter_stream_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapterStreamLoadStrategy, nautilus_adapter_stream_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
 
 
 static void
@@ -93,7 +93,7 @@ nautilus_adapter_stream_load_strategy_destroy (GtkObject *object)
 
 	g_free (strategy->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/adapter/nautilus-adapter.c b/components/adapter/nautilus-adapter.c
index 87d1d4641..ea9696641 100644
--- a/components/adapter/nautilus-adapter.c
+++ b/components/adapter/nautilus-adapter.c
@@ -40,7 +40,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-generous-bin.h>
 #include <libnautilus-adapter/nautilus-adapter-factory.h>
 
@@ -81,7 +81,7 @@ static void nautilus_adapter_initialize       (NautilusAdapter      *server);
 static void nautilus_adapter_destroy          (GtkObject                      *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusAdapter,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusAdapter,
 				   nautilus_adapter,
 				   GTK_TYPE_OBJECT)
 
@@ -143,7 +143,7 @@ nautilus_adapter_destroy (GtkObject *object)
 
 	g_free (adapter->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusAdapter *
diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am
index 5cca0cf33..9149f931e 100644
--- a/components/hardware/Makefile.am
+++ b/components/hardware/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Nautilus-Hardware\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS)					\
 	$(VFS_CFLAGS)					\
 	$(BONOBO_CFLAGS)				\
@@ -35,6 +37,8 @@ nautilus_hardware_view_SOURCES =		        \
 nautilus_hardware_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/hardware/nautilus-hardware-view.c b/components/hardware/nautilus-hardware-view.c
index 9240be1d7..34e848fec 100644
--- a/components/hardware/nautilus-hardware-view.c
+++ b/components/hardware/nautilus-hardware-view.c
@@ -34,17 +34,17 @@
 #include <gnome.h>
 #include <gtk/gtksignal.h>
 #include <libgnorba/gnorba.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/libnautilus.h>
 #include <limits.h>
 #include <sys/stat.h>
@@ -77,7 +77,7 @@ static void hardware_view_load_location_callback      (NautilusView
                                                        const char                *location,
                                                        NautilusHardwareView      *hardware_view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusHardwareView, nautilus_hardware_view, GTK_TYPE_EVENT_BOX)
 
 #define HARDWARE_DEFAULT_BACKGROUND_COLOR  "rgb:DDDD/DDDD/BBBB"
 
@@ -99,7 +99,7 @@ nautilus_hardware_view_initialize_class (NautilusHardwareViewClass *klass)
 static void
 nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view)
 {
-  	NautilusBackground *background;
+  	EelBackground *background;
 	hardware_view->details = g_new0 (NautilusHardwareViewDetails, 1);
 
 	hardware_view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (hardware_view));
@@ -111,13 +111,13 @@ nautilus_hardware_view_initialize (NautilusHardwareView *hardware_view)
 
 	hardware_view->details->form = NULL;
 
-  	background = nautilus_get_widget_background (GTK_WIDGET (hardware_view));
-  	nautilus_background_set_color (background, HARDWARE_DEFAULT_BACKGROUND_COLOR);
+  	background = eel_get_widget_background (GTK_WIDGET (hardware_view));
+  	eel_background_set_color (background, HARDWARE_DEFAULT_BACKGROUND_COLOR);
 
 	/* prepare ourselves to receive dropped objects */
 	gtk_drag_dest_set (GTK_WIDGET (hardware_view),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   hardware_dnd_target_table, NAUTILUS_N_ELEMENTS (hardware_dnd_target_table), GDK_ACTION_COPY);
+			   hardware_dnd_target_table, EEL_N_ELEMENTS (hardware_dnd_target_table), GDK_ACTION_COPY);
   		
 	gtk_widget_show_all (GTK_WIDGET (hardware_view));
 }
@@ -131,7 +131,7 @@ nautilus_hardware_view_destroy (GtkObject *object)
 
 	g_free (hardware_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Component embedding support */
@@ -180,7 +180,7 @@ extract_info (char* data, const char *field_name, int nth)
 		if (info_array[index] == NULL) {
 			break;
                 }
-		if (nautilus_str_has_prefix(info_array[index], field_name)) {
+		if (eel_str_has_prefix(info_array[index], field_name)) {
 			if (nth > 0) {
                                 nth--;
 			} else {
@@ -358,15 +358,15 @@ setup_form_title (NautilusHardwareView *view,
 	if (image_name != NULL) {
  		file_name = gnome_pixmap_file (image_name);
 		if (file_name != NULL) {
-			temp_widget = nautilus_image_new (file_name);
+			temp_widget = eel_image_new (file_name);
 			gtk_box_pack_start (GTK_BOX(temp_container), temp_widget, 0, 0, 8);		
 			gtk_widget_show (temp_widget);
 			g_free (file_name);
 		}
 	}
 	
- 	temp_widget = nautilus_label_new (title_text);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 10);
+ 	temp_widget = eel_label_new (title_text);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 10);
 
 	gtk_box_pack_start (GTK_BOX (temp_container), temp_widget, 0, 0, 8);			 	
 	gtk_widget_show (temp_widget);
@@ -419,13 +419,13 @@ setup_overview_form (NautilusHardwareView *view)
 		gtk_widget_show (temp_box);
 
 		file_name = nautilus_pixmap_file ("cpu.png");
-                temp_widget = nautilus_image_new (file_name);
+                temp_widget = eel_image_new (file_name);
 		gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0);		
 		gtk_widget_show (temp_widget);
 		g_free (file_name);
 		
-		temp_widget = nautilus_label_new (temp_text);
-		nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
+		temp_widget = eel_label_new (temp_text);
+		eel_label_make_larger (EEL_LABEL (temp_widget), 2);
 		g_free(temp_text);
 		gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0 );			
 		gtk_widget_show (temp_widget);
@@ -439,14 +439,14 @@ setup_overview_form (NautilusHardwareView *view)
 	gtk_widget_show (temp_box);
 
  	file_name = nautilus_pixmap_file ("memory_chip.gif");
-  	temp_widget = nautilus_image_new (file_name);
+  	temp_widget = eel_image_new (file_name);
 	gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0);		
   	gtk_widget_show(temp_widget);
   	g_free (file_name);
 	
 	temp_text = get_RAM_description ();
-	temp_widget = nautilus_label_new (temp_text);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
+	temp_widget = eel_label_new (temp_text);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
 	g_free (temp_text);
 	gtk_box_pack_start (GTK_BOX(temp_box), temp_widget, 0, 0, 0 );			
  	gtk_widget_show (temp_widget);
@@ -477,16 +477,16 @@ setup_overview_form (NautilusHardwareView *view)
                                         file_name = nautilus_pixmap_file("i-harddisk.png");
                                 }
                                 
-				pixmap_widget = nautilus_image_new (file_name);
+				pixmap_widget = eel_image_new (file_name);
 				gtk_box_pack_start (GTK_BOX(temp_box), pixmap_widget, 0, 0, 0);
 				gtk_widget_show(pixmap_widget);
 				g_free(file_name);
 				g_free(ide_media);
                                 
 				temp_text = get_IDE_description (device);
-				temp_widget = nautilus_label_new (temp_text);
-				nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
-				nautilus_label_set_justify (NAUTILUS_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
+				temp_widget = eel_label_new (temp_text);
+				eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+				eel_label_set_justify (EEL_LABEL (temp_widget), GTK_JUSTIFY_CENTER);
 
 				g_free(temp_text);
                                 gtk_box_pack_start(GTK_BOX(temp_box), temp_widget, 0, 0, 0);
@@ -518,9 +518,9 @@ setup_CPU_form (NautilusHardwareView *view)
 	setup_form_title (view, NULL, "CPU");
 	
 	message = _("This is a placeholder for the CPU page.");
-	temp_widget = nautilus_label_new (message);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
- 	nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
+	temp_widget = eel_label_new (message);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+ 	eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
 	
 	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
  	gtk_widget_show (temp_widget);
@@ -543,9 +543,9 @@ setup_RAM_form (NautilusHardwareView *view)
 	setup_form_title (view, NULL, "RAM");
 	
 	message = _("This is a placeholder for the RAM page.");
-	temp_widget = nautilus_label_new (message);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
- 	nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
+	temp_widget = eel_label_new (message);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+ 	eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
 	
 	gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);			
  	gtk_widget_show (temp_widget);
@@ -568,9 +568,9 @@ setup_IDE_form (NautilusHardwareView *view)
         setup_form_title (view, NULL, "IDE");
         
         message = _("This is a placeholder for the IDE page.");
-        temp_widget = nautilus_label_new (message);
-	nautilus_label_make_larger (NAUTILUS_LABEL (temp_widget), 2);
-        nautilus_label_set_wrap(NAUTILUS_LABEL(temp_widget), TRUE);
+        temp_widget = eel_label_new (message);
+	eel_label_make_larger (EEL_LABEL (temp_widget), 2);
+        eel_label_set_wrap(EEL_LABEL(temp_widget), TRUE);
         
         gtk_box_pack_start(GTK_BOX(view->details->form), temp_widget, 0, 0, 12);            
         gtk_widget_show (temp_widget);
@@ -645,7 +645,7 @@ nautilus_hardware_view_drag_data_received (GtkWidget *widget, GdkDragContext *co
 	switch (info) {
         case TARGET_COLOR:
                 /* Let the background change based on the dropped color. */
-                nautilus_background_receive_dropped_color (nautilus_get_widget_background (widget),
+                eel_background_receive_dropped_color (eel_get_widget_background (widget),
                                                            widget, x, y, selection_data);
                 break;
                 
diff --git a/components/help/Makefile.am b/components/help/Makefile.am
index 1daf87c6f..dee27442f 100644
--- a/components/help/Makefile.am
+++ b/components/help/Makefile.am
@@ -9,6 +9,8 @@ noinst_PROGRAMS=test-help-method
 INCLUDES = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS) \
 	$(BONOBO_CFLAGS) \
 	$(GCONF_CFLAGS) \
@@ -19,11 +21,12 @@ INCLUDES = \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	-DINFODIR=\"$(infodir)\" \
 	-DENABLE_SCROLLKEEPER_SUPPORT
-	
 
 LDADD =\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS) \
diff --git a/components/help/help-method.c b/components/help/help-method.c
index c7f59ff70..9aa9faf3c 100644
--- a/components/help/help-method.c
+++ b/components/help/help-method.c
@@ -57,7 +57,7 @@ typedef struct {
 
 static gboolean file_in_info_path (const char *file);
 
-/* This is a copy of nautilus_shell_quote. The best thing to do is to
+/* This is a copy of eel_shell_quote. The best thing to do is to
  * use the one on GNOME for GNOME 2.0, but we could also move this
  * into gnome-vfs or some other library so we could share it.
  */
diff --git a/components/help/hyperbola-filefmt.c b/components/help/hyperbola-filefmt.c
index d29a1a7a8..bc034aaf9 100644
--- a/components/help/hyperbola-filefmt.c
+++ b/components/help/hyperbola-filefmt.c
@@ -25,7 +25,7 @@
 
 #include "hyperbola-filefmt.h"
 
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 
 #include <zlib.h>
 #include <dirent.h>
@@ -895,7 +895,7 @@ fmt_help_populate_tree (HyperbolaDocTree * tree)
 		fmt_help_populate_tree_from_subdir (tree, node->data, app_path);
 	}
 
-	nautilus_g_list_free_deep (help_directories);
+	eel_g_list_free_deep (help_directories);
 }
 #endif
 
diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c
index ad5dbf01d..0fcc8fa80 100644
--- a/components/help/hyperbola-nav-tree.c
+++ b/components/help/hyperbola-nav-tree.c
@@ -6,7 +6,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libnautilus-extensions/nautilus-ctree.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-gdk-font-extensions.h>
+#include <eel/eel-gdk-font-extensions.h>
 
 #include "hyperbola-nav.h"
 
diff --git a/components/history/Makefile.am b/components/history/Makefile.am
index 6f9f061b8..da21e5c3a 100644
--- a/components/history/Makefile.am
+++ b/components/history/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES=\
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(BONOBO_CFLAGS) \
@@ -15,6 +17,8 @@ INCLUDES=\
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS)
diff --git a/components/history/nautilus-history-view.c b/components/history/nautilus-history-view.c
index 8c04b96d1..3e1855dc1 100644
--- a/components/history/nautilus-history-view.c
+++ b/components/history/nautilus-history-view.c
@@ -33,8 +33,8 @@
 #include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <libnautilus-extensions/nautilus-bookmark.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view-standard-main.h>
 
 #define NAUTILUS_TYPE_HISTORY_VIEW            (nautilus_history_view_get_type ())
@@ -64,7 +64,7 @@ static void    nautilus_history_view_initialize_class (NautilusHistoryViewClass
 static void    nautilus_history_view_initialize       (NautilusHistoryView      *view);
 static void    nautilus_history_view_destroy          (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusHistoryView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusHistoryView,
 				   nautilus_history_view,
 				   NAUTILUS_TYPE_VIEW)
 
@@ -89,7 +89,7 @@ install_icon (GtkCList *list, int row, GdkPixbuf *pixbuf)
 
 	if (pixbuf != NULL) {
 		gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &mask, 
-						   NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+						   EEL_STANDARD_ALPHA_THRESHHOLD);
 	} else {
 		bookmark = get_bookmark_from_row (list, row);
 		if (!nautilus_bookmark_get_pixmap_and_mask (bookmark, NAUTILUS_ICON_SIZE_SMALLER,
@@ -325,7 +325,7 @@ nautilus_history_view_destroy (GtkObject *object)
 
 	gtk_object_unref (GTK_OBJECT (view->list));
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 int
diff --git a/components/image-viewer/Makefile.am b/components/image-viewer/Makefile.am
index 2f341c703..3316cc668 100644
--- a/components/image-viewer/Makefile.am
+++ b/components/image-viewer/Makefile.am
@@ -16,6 +16,8 @@ INCLUDES =	\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/libnautilus	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)	\
 	$(GCONF_CFLAGS)		\
 	$(BONOBO_CFLAGS)	\
@@ -24,6 +26,8 @@ INCLUDES =	\
 nautilus_image_view_LDADD = 			\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS)
diff --git a/components/loser/content/Makefile.am b/components/loser/content/Makefile.am
index d705fea6d..9908ab459 100644
--- a/components/loser/content/Makefile.am
+++ b/components/loser/content/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =					\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(OAF_CFLAGS)				\
 	$(BONOBO_CFLAGS)			\
 	$(GCONF_CFLAGS) 			\
@@ -27,6 +29,8 @@ nautilus_content_loser_SOURCES =		\
 nautilus_content_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)					\
 	$(BONOBO_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/loser/content/nautilus-content-loser.c b/components/loser/content/nautilus-content-loser.c
index 21f0c6c8c..9d22e1eb0 100644
--- a/components/loser/content/nautilus-content-loser.c
+++ b/components/loser/content/nautilus-content-loser.c
@@ -34,7 +34,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -47,7 +47,7 @@ static void nautilus_content_loser_initialize_class (NautilusContentLoserClass *
 static void nautilus_content_loser_initialize       (NautilusContentLoser      *view);
 static void nautilus_content_loser_destroy          (GtkObject                 *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusContentLoser, nautilus_content_loser, GTK_TYPE_LABEL)
      
 static void loser_load_location_callback      (NautilusView         *nautilus_view,
 					       const char           *location,
@@ -104,7 +104,7 @@ nautilus_content_loser_destroy (GtkObject *object)
 	g_free (view->details->uri);
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /**
diff --git a/components/loser/sidebar/Makefile.am b/components/loser/sidebar/Makefile.am
index 3e207259a..6b9b3660d 100644
--- a/components/loser/sidebar/Makefile.am
+++ b/components/loser/sidebar/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES =					\
 	-DICON_DIR=\"$(datadir)/pixmaps/nautilus\" \
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 			\
 	$(OAF_CFLAGS)				\
 	$(BONOBO_CFLAGS)			\
@@ -26,6 +28,8 @@ nautilus_sidebar_loser_SOURCES =		\
 nautilus_sidebar_loser_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)					\
 	$(BONOBO_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/loser/sidebar/nautilus-sidebar-loser.c b/components/loser/sidebar/nautilus-sidebar-loser.c
index 50f30e332..a10d6ca21 100644
--- a/components/loser/sidebar/nautilus-sidebar-loser.c
+++ b/components/loser/sidebar/nautilus-sidebar-loser.c
@@ -34,7 +34,7 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 #include <stdlib.h>
 
@@ -49,7 +49,7 @@ static void nautilus_sidebar_loser_initialize_class (NautilusSidebarLoserClass *
 static void nautilus_sidebar_loser_initialize       (NautilusSidebarLoser      *view);
 static void nautilus_sidebar_loser_destroy          (GtkObject                      *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSidebarLoser, nautilus_sidebar_loser, GTK_TYPE_LABEL)
      
 static void loser_load_location_callback      (NautilusView         *nautilus_view,
 					       const char           *location,
@@ -107,7 +107,7 @@ nautilus_sidebar_loser_destroy (GtkObject *object)
 	g_free (view->details->uri);
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /**
diff --git a/components/mozilla/Makefile.am b/components/mozilla/Makefile.am
index 7ac1fe6cd..bd6332473 100644
--- a/components/mozilla/Makefile.am
+++ b/components/mozilla/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES = \
 	$(MOZILLA_PROFILES_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(BONOBO_CFLAGS) \
 	$(GCONF_CFLAGS) \
 	$(GNOMEUI_CFLAGS) \
@@ -45,6 +47,8 @@ noinst_HEADERS =\
 nautilus_mozilla_content_view_LDADD = \
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS) \
diff --git a/components/mozilla/bonobo-extensions.c b/components/mozilla/bonobo-extensions.c
index 47810bd91..7d4622af0 100644
--- a/components/mozilla/bonobo-extensions.c
+++ b/components/mozilla/bonobo-extensions.c
@@ -395,7 +395,7 @@ nautilus_bonobo_remove_menu_items_and_commands (BonoboUIComponent *ui,
 }
 
 static char *
-nautilus_str_strip_chr (const char *source, char remove_this)
+eel_str_strip_chr (const char *source, char remove_this)
 {
 	char *result, *out;
 	const char *in;
@@ -429,7 +429,7 @@ nautilus_bonobo_set_label_for_menu_item_and_command (BonoboUIComponent *ui,
 {
 	char *label_no_underscore;
 
-	label_no_underscore = nautilus_str_strip_chr (label_with_underscore, '_');
+	label_no_underscore = eel_str_strip_chr (label_with_underscore, '_');
 	nautilus_bonobo_set_label (ui,
 				   menu_item_path,
 				   label_with_underscore);
diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c
index 88b1ac3e1..53fe42be6 100644
--- a/components/mozilla/nautilus-mozilla-content-view.c
+++ b/components/mozilla/nautilus-mozilla-content-view.c
@@ -60,7 +60,7 @@
 #include <libgnomeui/gnome-dialog.h>
 #include <libgnomeui/gnome-dialog-util.h>
 
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
+#include <eel/eel-stock-dialogs.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 
 #ifdef EAZEL_SERVICES
@@ -806,7 +806,7 @@ mozilla_new_window_callback (GtkMozEmbed *mozilla)
 	g_warning ("Nautilus does not support JavaScript spawning of new windows!\n");
 #endif
 
-	dialog = nautilus_show_warning_dialog (_("A JavaScript function (small software program) on this page tried to open a new window, but nautilus does not support the opening of new windows by JavaScript.\n\nTry viewing the page in a different web browser, such as Mozilla or Netscape."),
+	dialog = eel_show_warning_dialog (_("A JavaScript function (small software program) on this page tried to open a new window, but nautilus does not support the opening of new windows by JavaScript.\n\nTry viewing the page in a different web browser, such as Mozilla or Netscape."),
 					     _("Nautilus Mozilla View Warning"),
 					     mozilla_get_containing_window (mozilla));
 
diff --git a/components/music/Makefile.am b/components/music/Makefile.am
index 292c5d815..8c7825083 100644
--- a/components/music/Makefile.am
+++ b/components/music/Makefile.am
@@ -15,6 +15,8 @@ INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Nautilus-Music\"	\
 	-I$(top_srcdir)				\
 	-I$(top_builddir)			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 			\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	$(GNOMEUI_CFLAGS)                       \
@@ -64,6 +66,8 @@ nautilus_music_view_SOURCES =		        \
 nautilus_music_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) \
diff --git a/components/music/nautilus-music-view.c b/components/music/nautilus-music-view.c
index c3c354513..67cf39fd2 100644
--- a/components/music/nautilus-music-view.c
+++ b/components/music/nautilus-music-view.c
@@ -31,24 +31,24 @@
 #include "mpg123.h"
 #include "pixmaps.h"
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-directory-background.h>
 #include <libnautilus-extensions/nautilus-directory-notify.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-sound.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus/libnautilus.h>
 
 #include <gnome.h>
@@ -177,7 +177,7 @@ static void nautilus_music_view_initialize_class              (NautilusMusicView
 static void nautilus_music_view_initialize                    (NautilusMusicView      *view);
 static void nautilus_music_view_destroy                       (GtkObject              *object);
 static void nautilus_music_view_update                        (NautilusMusicView      *music_view);
-static void music_view_background_appearance_changed_callback (NautilusBackground     *background,
+static void music_view_background_appearance_changed_callback (EelBackground     *background,
                                                                NautilusMusicView      *music_view);
 static void music_view_load_location_callback                 (NautilusView           *view,
                                                                const char             *location,
@@ -213,7 +213,7 @@ static void nautilus_music_view_load_uri (NautilusMusicView *view,
 
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusMusicView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusMusicView,
                                    nautilus_music_view,
                                    NAUTILUS_TYPE_VIEW)
 
@@ -256,7 +256,7 @@ nautilus_music_view_initialize (NautilusMusicView *music_view)
 			    music_view_load_location_callback, 
 			    music_view);
 			    
-	gtk_signal_connect (GTK_OBJECT (nautilus_get_widget_background (GTK_WIDGET (music_view->details->event_box))), 
+	gtk_signal_connect (GTK_OBJECT (eel_get_widget_background (GTK_WIDGET (music_view->details->event_box))), 
 			    "appearance_changed",
 			    music_view_background_appearance_changed_callback, 
 			    music_view);
@@ -270,13 +270,13 @@ nautilus_music_view_initialize (NautilusMusicView *music_view)
 	gtk_container_add (GTK_CONTAINER (music_view->details->event_box), GTK_WIDGET (music_view->details->album_container));
 		
 	/* allocate a widget for the album title */	
-	music_view->details->album_title = nautilus_label_new ("");
-	nautilus_label_make_larger (NAUTILUS_LABEL (music_view->details->album_title), 8);
+	music_view->details->album_title = eel_label_new ("");
+	eel_label_make_larger (EEL_LABEL (music_view->details->album_title), 8);
 
 	gtk_box_pack_start (GTK_BOX (music_view->details->album_container), music_view->details->album_title, FALSE, FALSE, 0);	
 	
         /* Localize the titles */
-        for (i = 0; i < NAUTILUS_N_ELEMENTS (titles); i++) {
+        for (i = 0; i < EEL_N_ELEMENTS (titles); i++) {
 		titles[i] = _(titles[i]);
 	}
 
@@ -355,7 +355,7 @@ nautilus_music_view_initialize (NautilusMusicView *music_view)
 	/* prepare ourselves to receive dropped objects */
 	gtk_drag_dest_set (GTK_WIDGET (music_view->details->event_box),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   music_dnd_target_table, NAUTILUS_N_ELEMENTS (music_dnd_target_table), GDK_ACTION_COPY);
+			   music_dnd_target_table, EEL_N_ELEMENTS (music_dnd_target_table), GDK_ACTION_COPY);
 
 
 	music_view->details->player_state = PLAYER_STOPPED;
@@ -384,7 +384,7 @@ nautilus_music_view_destroy (GtkObject *object)
         detach_file (music_view);
 	g_free (music_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* utility to return the text describing a song */
@@ -435,7 +435,7 @@ music_view_set_selected_song_title (NautilusMusicView *music_view, int row)
 	music_view->details->selected_index = row;
 	
 	label_text = get_song_text (music_view, row);
-	nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->song_label), label_text);
+	eel_label_set_text (EEL_LABEL(music_view->details->song_label), label_text);
 	g_free (label_text);
         
 	gtk_clist_get_text (GTK_CLIST(music_view->details->song_list), row, 5, &temp_str);
@@ -522,7 +522,7 @@ compare_song_titles (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 		return 0;
 	}
 
-	return nautilus_strcoll (info1->title, info2->title);
+	return eel_strcoll (info1->title, info2->title);
 }
 
 static int
@@ -541,7 +541,7 @@ compare_song_artists (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 		return 0;
 	}
 
-	return nautilus_strcoll (info1->artist, info2->artist);
+	return eel_strcoll (info1->artist, info2->artist);
 }
 
 static int
@@ -579,7 +579,7 @@ compare_song_years (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 		return 0;
 	}
 
-	return nautilus_strcoll (info1->year, info2->year);	
+	return eel_strcoll (info1->year, info2->year);	
 }
 
 static int
@@ -670,7 +670,7 @@ ensure_uri_is_image(const char *uri)
 		(uri, file_info,
 		 GNOME_VFS_FILE_INFO_GET_MIME_TYPE
 		 | GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
-        is_image = nautilus_istr_has_prefix (file_info->mime_type, "image/") && (nautilus_strcmp (file_info->mime_type, "image/svg") != 0);
+        is_image = eel_istr_has_prefix (file_info->mime_type, "image/") && (eel_strcmp (file_info->mime_type, "image/svg") != 0);
 	gnome_vfs_file_info_unref (file_info);
 	return is_image;
 }
@@ -693,7 +693,7 @@ set_album_cover (GtkWidget *widget, gpointer *data)
 		char *message = g_strdup_printf
 			(_("Sorry, but '%s' is not a usable image file."),
 			 path_name);
-		nautilus_show_error_dialog (message, _("Not an Image"), NULL);
+		eel_show_error_dialog (message, _("Not an Image"), NULL);
 		g_free (message);
 		
 		g_free (path_uri);
@@ -791,8 +791,8 @@ release_song_info (SongInfo *info)
 static gboolean
 is_mp3_file (GnomeVFSFileInfo *file_info)
 {
-	return nautilus_istr_has_prefix (file_info->mime_type, "audio/")
-		&& nautilus_istr_has_suffix (file_info->mime_type, "mp3");
+	return eel_istr_has_prefix (file_info->mime_type, "audio/")
+		&& eel_istr_has_suffix (file_info->mime_type, "mp3");
 }
 
 /* read the id3 tag of the file if present */
@@ -990,7 +990,7 @@ determine_attribute (GList *song_list, gboolean is_artist)
 		info = (SongInfo *) p->data;
 		this_attribute = is_artist ? info->artist : info->album;
 		
-		if (this_attribute && nautilus_strcmp (this_attribute, current_attribute)) {
+		if (this_attribute && eel_strcmp (this_attribute, current_attribute)) {
 			if (current_attribute == NULL) {
 				current_attribute = g_strdup (this_attribute);
 			} else {
@@ -1032,7 +1032,7 @@ reset_playtime (NautilusMusicView *music_view)
  	gtk_range_set_adjustment (GTK_RANGE (music_view->details->playtime_bar),
                                   GTK_ADJUSTMENT (music_view->details->playtime_adjustment));	
 	gtk_widget_set_sensitive (music_view->details->playtime_bar, FALSE);	
-	nautilus_label_set_text  (NAUTILUS_LABEL (music_view->details->playtime), "--:--");
+	eel_label_set_text  (EEL_LABEL (music_view->details->playtime), "--:--");
 }
 
 /* status display timer task */
@@ -1079,7 +1079,7 @@ play_status_display (NautilusMusicView *music_view)
                                 			  GTK_ADJUSTMENT(music_view->details->playtime_adjustment));	
 
 				if (!music_view->details->slider_dragging) {
-		 			nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->playtime),
+		 			eel_label_set_text (EEL_LABEL(music_view->details->playtime),
                                                                  play_time_str);	
                         	}                             
 			}
@@ -1171,7 +1171,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
 	int length;
 
 	if (esdout_playing ()) {
-		nautilus_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
+		eel_show_error_dialog (_("Sorry, but the music view is unable to play back sound right now. "
 					      "Either another program is using or blocking the sound card, "
 					      "or your sound card is not configured properly. Try quitting any "
 					      "applications that may be blocking use of the sound card."),
@@ -1195,7 +1195,7 @@ play_current_file (NautilusMusicView *music_view, gboolean from_start)
 
 	/* for now, we can only play local files, so apologize to the user and give up */	
 	if (song_filename == NULL) {
-                nautilus_show_error_dialog
+                eel_show_error_dialog
                         ( _("Sorry, but the music view can't play non-local files yet."),
                           _("Can't Play Remote Files"),
                           NULL);
@@ -1346,7 +1346,7 @@ slider_moved_callback (GtkWidget *bar, GdkEvent *event, NautilusMusicView *music
 		seconds = seconds % 60;
 		sprintf(temp_str, "%02d:%02d", minutes, seconds);
 
-		nautilus_label_set_text (NAUTILUS_LABEL(music_view->details->playtime), temp_str);
+		eel_label_set_text (EEL_LABEL(music_view->details->playtime), temp_str);
 	}
         return FALSE;
 }
@@ -1492,9 +1492,9 @@ add_play_controls (NautilusMusicView *music_view)
 	gtk_widget_show (music_view->details->playtime_bar);
 
 	/* playtime label */
-	music_view->details->playtime = nautilus_label_new ("--:--");
-	nautilus_label_make_larger (NAUTILUS_LABEL (music_view->details->playtime), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (music_view->details->playtime), GTK_JUSTIFY_LEFT);	
+	music_view->details->playtime = eel_label_new ("--:--");
+	eel_label_make_larger (EEL_LABEL (music_view->details->playtime), 2);
+	eel_label_set_justify (EEL_LABEL (music_view->details->playtime), GTK_JUSTIFY_LEFT);	
 	gtk_misc_set_alignment (GTK_MISC (music_view->details->playtime), 0.0, 0.0);
 	gtk_widget_show (music_view->details->playtime);
 	gtk_box_pack_start (GTK_BOX (hbox), music_view->details->playtime, FALSE, FALSE, 0);
@@ -1576,9 +1576,9 @@ add_play_controls (NautilusMusicView *music_view)
 	gtk_widget_show (button);
 
 	/* Song title label */
-	music_view->details->song_label = nautilus_label_new ("");
-	nautilus_label_make_larger (NAUTILUS_LABEL (music_view->details->song_label), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (music_view->details->song_label), GTK_JUSTIFY_LEFT);
+	music_view->details->song_label = eel_label_new ("");
+	eel_label_make_larger (EEL_LABEL (music_view->details->song_label), 2);
+	eel_label_set_justify (EEL_LABEL (music_view->details->song_label), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_end (GTK_BOX (vbox), music_view->details->song_label, FALSE, FALSE, 2);	
 	gtk_widget_show (music_view->details->song_label);	
 }
@@ -1598,10 +1598,10 @@ nautilus_music_view_set_album_image (NautilusMusicView *music_view, const char *
   		pixbuf = gdk_pixbuf_new_from_file (image_path);
 		
 		if (pixbuf != NULL) {
-			scaled_pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
+			scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, SCALED_IMAGE_WIDTH, SCALED_IMAGE_HEIGHT);
 			gdk_pixbuf_unref (pixbuf);
 
-       			gdk_pixbuf_render_pixmap_and_mask (scaled_pixbuf, &pixmap, &mask, NAUTILUS_STANDARD_ALPHA_THRESHHOLD);
+       			gdk_pixbuf_render_pixmap_and_mask (scaled_pixbuf, &pixmap, &mask, EEL_STANDARD_ALPHA_THRESHHOLD);
 			gdk_pixbuf_unref (scaled_pixbuf);
 			
 			if (music_view->details->album_image == NULL) {
@@ -1677,7 +1677,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
 	if (result != GNOME_VFS_OK) {
 		path = gnome_vfs_get_local_path_from_uri (uri);
 		message = g_strdup_printf (_("Sorry, but there was an error reading %s."), path);
-		nautilus_show_error_dialog (message, _("Can't Read Folder"), 
+		eel_show_error_dialog (message, _("Can't Read Folder"), 
 				            GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (music_view->details->event_box))));
 		g_free (path);
 		g_free (message);
@@ -1706,7 +1706,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
 		} else {
 		        /* it's not an mp3 file, so see if it's an image */
         		const char *mime_type = gnome_vfs_file_info_get_mime_type (current_file_info);		        	
-		        if (nautilus_istr_has_prefix (mime_type, "image/")) {
+		        if (eel_istr_has_prefix (mime_type, "image/")) {
 		        	/* for now, just keep the first image */
 		        	if (image_path_uri == NULL) {
 		        		image_path_uri = g_strdup (path_uri);
@@ -1794,7 +1794,7 @@ nautilus_music_view_update (NautilusMusicView *music_view)
 		} else {
 			temp_str = g_strdup (album_name);
                 }
-		nautilus_label_set_text (NAUTILUS_LABEL (music_view->details->album_title), temp_str);
+		eel_label_set_text (EEL_LABEL (music_view->details->album_title), temp_str);
 		
 		g_free (temp_str);
 		g_free (album_name);
@@ -1843,22 +1843,22 @@ nautilus_music_view_load_uri (NautilusMusicView *music_view, const char *uri)
 }
 
 static void
-music_view_background_appearance_changed_callback (NautilusBackground *background, NautilusMusicView *music_view)
+music_view_background_appearance_changed_callback (EelBackground *background, NautilusMusicView *music_view)
 {
 	guint32 text_color;
 
-	text_color = nautilus_background_is_dark (background) ? NAUTILUS_RGBA_COLOR_OPAQUE_WHITE : NAUTILUS_RGBA_COLOR_OPAQUE_BLACK;
+	text_color = eel_background_is_dark (background) ? EEL_RGBA_COLOR_OPAQUE_WHITE : EEL_RGBA_COLOR_OPAQUE_BLACK;
 
 	if (music_view->details->album_title != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (music_view->details->album_title),
+		eel_label_set_text_color (EEL_LABEL (music_view->details->album_title),
                                                text_color);
 	}
 	if (music_view->details->song_label != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (music_view->details->song_label),
+		eel_label_set_text_color (EEL_LABEL (music_view->details->song_label),
                                                text_color);
 	}
 	if (music_view->details->playtime != NULL) {
-		nautilus_label_set_text_color (NAUTILUS_LABEL (music_view->details->playtime),
+		eel_label_set_text_color (EEL_LABEL (music_view->details->playtime),
                                                text_color);
 	}
 }
@@ -1897,14 +1897,14 @@ nautilus_music_view_drag_data_received (GtkWidget *widget, GdkDragContext *conte
   		
         case TARGET_COLOR:
                 /* Let the background change based on the dropped color. */
-                nautilus_background_receive_dropped_color
-                        (nautilus_get_widget_background (widget),
+                eel_background_receive_dropped_color
+                        (eel_get_widget_background (widget),
                          widget, x, y, selection_data);
                 break;
   
   	case TARGET_BGIMAGE:
-		nautilus_background_receive_dropped_background_image
-			(nautilus_get_widget_background (widget),
+		eel_background_receive_dropped_background_image
+			(eel_get_widget_background (widget),
                          uris[0]);
   		break;              
 
diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am
index 8c4bb0009..1e9a7ef21 100644
--- a/components/notes/Makefile.am
+++ b/components/notes/Makefile.am
@@ -7,6 +7,8 @@ INCLUDES=\
 	-I$(top_builddir)	\
 	-I$(top_builddir)/libnautilus	\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)	\
 	$(GCONF_CFLAGS)		\
 	$(BONOBO_CFLAGS)	\
@@ -15,6 +17,8 @@ INCLUDES=\
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(GCONF_LIBS) \
 	$(GNOMEUI_LIBS)
diff --git a/components/notes/nautilus-notes.c b/components/notes/nautilus-notes.c
index 30de4e97c..beeb376d0 100644
--- a/components/notes/nautilus-notes.c
+++ b/components/notes/nautilus-notes.c
@@ -32,14 +32,14 @@
 #include <ctype.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-background.h>
+#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-file.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-string.h>
 
 /* FIXME bugzilla.eazel.com 4436: 
  * Undo not working in notes-view.
@@ -164,7 +164,7 @@ load_note_text_from_metadata (NautilusFile *file,
 	/* This fn is called for any change signal on the file, so make sure that the
 	 * metadata has actually changed.
 	 */
-        if (nautilus_strcmp (saved_text, notes->previous_saved_text) != 0) {
+        if (eel_strcmp (saved_text, notes->previous_saved_text) != 0) {
 		notify_listeners_if_changed (notes, saved_text);
 		
 		g_free (notes->previous_saved_text);
@@ -240,7 +240,7 @@ notify_listeners_if_changed (Notes *notes, char *new_notes)
 	char *tab_image;
 	BonoboArg *tab_image_arg;
 
-	if (nautilus_strcmp (notes->previous_saved_text, new_notes) != 0) {
+	if (eel_strcmp (notes->previous_saved_text, new_notes) != 0) {
 		/* notify listeners that the notes text has changed */	
 		tab_image = notes_get_indicator_image (new_notes);	
 		
@@ -365,7 +365,7 @@ make_notes_view (BonoboGenericFactory *Factory, const char *iid, gpointer closur
 {
         GtkWidget *vbox;
         Notes *notes;
-        NautilusBackground *background;
+        EelBackground *background;
         GdkFont *font;
          
         g_return_val_if_fail (strcmp (iid, "OAFIID:nautilus_notes_view:7f04c3cb-df79-4b9a-a577-38b19ccd4185") == 0, NULL);
@@ -380,13 +380,13 @@ make_notes_view (BonoboGenericFactory *Factory, const char *iid, gpointer closur
         notes->note_text_field = gtk_text_new (NULL, NULL);
         
         font = nautilus_font_factory_get_font_from_preferences (14);
-        nautilus_gtk_widget_set_font (notes->note_text_field, font);
+        eel_gtk_widget_set_font (notes->note_text_field, font);
         gdk_font_unref (font);
 
         gtk_text_set_editable (GTK_TEXT (notes->note_text_field), TRUE);	
         gtk_box_pack_start (GTK_BOX (vbox), notes->note_text_field, TRUE, TRUE, 0);
-        background = nautilus_get_widget_background (notes->note_text_field);
-        nautilus_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
+        background = eel_get_widget_background (notes->note_text_field);
+        eel_background_set_color (background, NOTES_DEFAULT_BACKGROUND_COLOR);
 
 	gtk_signal_connect (GTK_OBJECT (notes->note_text_field), "focus_out_event",
       	              	    GTK_SIGNAL_FUNC (on_text_field_focus_out_event),
@@ -441,7 +441,7 @@ main(int argc, char *argv[])
 	 * Unfortunately, this has to be done explicitly for each domain.
 	 */
 	if (g_getenv("NAUTILUS_DEBUG") != NULL) {
-		nautilus_make_warnings_and_criticals_stop_in_debugger
+		eel_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", "GnomeUI", "Bonobo", NULL);
 	}
 	
diff --git a/components/rpmview/Makefile.am b/components/rpmview/Makefile.am
index c17c7cd1d..16c3a4671 100644
--- a/components/rpmview/Makefile.am
+++ b/components/rpmview/Makefile.am
@@ -18,6 +18,8 @@ INCLUDES = 							\
 	-I$(top_builddir)/components/services/trilobite 	\
 	-I$(top_builddir) 					\
 	-I/usr/include/rpm 					\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 					\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
 	$(GNOMEUI_CFLAGS) 					\
@@ -51,6 +53,8 @@ nautilus_rpm_view_SOURCES =		        \
 nautilus_rpm_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(INVENTORY_LIBS)			\
 	$(extra_libs)				\
 	$(BONOBO_LIBS) 				\
diff --git a/components/rpmview/nautilus-rpm-verify-window.c b/components/rpmview/nautilus-rpm-verify-window.c
index af0e3313d..5c3d59654 100644
--- a/components/rpmview/nautilus-rpm-verify-window.c
+++ b/components/rpmview/nautilus-rpm-verify-window.c
@@ -37,11 +37,11 @@
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-pixmap.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 
@@ -67,7 +67,7 @@ static void     nautilus_rpm_verify_window_initialize_class	(NautilusRPMVerifyWi
 static void     nautilus_rpm_verify_window_initialize		(NautilusRPMVerifyWindow *rpm_verify_window);
 static void	nautilus_rpm_verify_window_destroy		(GtkObject *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusRPMVerifyWindow, nautilus_rpm_verify_window, GNOME_TYPE_DIALOG)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusRPMVerifyWindow, nautilus_rpm_verify_window, GNOME_TYPE_DIALOG)
 
 static void
 nautilus_rpm_verify_window_initialize_class (NautilusRPMVerifyWindowClass *rpm_verify_window_class)
@@ -97,7 +97,7 @@ nautilus_rpm_verify_window_destroy (GtkObject *object)
 		
 	g_free (NAUTILUS_RPM_VERIFY_WINDOW (object)->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* handle the continue button  */
@@ -133,17 +133,17 @@ nautilus_rpm_verify_window_initialize (NautilusRPMVerifyWindow *rpm_verify_windo
 	gtk_widget_show (window_contents);
 	
 	/* allocate the package title label */
-        label = nautilus_label_new ("");
+        label = eel_label_new ("");
 	gtk_widget_show (label);
-	nautilus_label_make_larger (NAUTILUS_LABEL (label), 2);
-	nautilus_label_set_justify (NAUTILUS_LABEL(label), GTK_JUSTIFY_CENTER);
+	eel_label_make_larger (EEL_LABEL (label), 2);
+	eel_label_set_justify (EEL_LABEL(label), GTK_JUSTIFY_CENTER);
 	gtk_box_pack_start (GTK_BOX (window_contents), label, FALSE, FALSE, 8);
 	rpm_verify_window->details->package_name = label;
 	
 	/* allocate the message label */
-        label = nautilus_label_new ("");
+        label = eel_label_new ("");
 	gtk_widget_show (label);
-	nautilus_label_set_justify (NAUTILUS_LABEL(label), GTK_JUSTIFY_CENTER);
+	eel_label_set_justify (EEL_LABEL(label), GTK_JUSTIFY_CENTER);
 	gtk_box_pack_start (GTK_BOX (window_contents), label, FALSE, FALSE, 8);
 	rpm_verify_window->details->file_message = label;
 	
@@ -186,7 +186,7 @@ nautilus_rpm_verify_window_new (const char *package_name)
 	gtk_window_set_title (GTK_WINDOW (rpm_verify_window), title_string);
 	
 	/* set up the package name */
-	nautilus_label_set_text (NAUTILUS_LABEL (rpm_verify_window->details->package_name), title_string);
+	eel_label_set_text (EEL_LABEL (rpm_verify_window->details->package_name), title_string);
 	g_free (title_string);
 	
 	return GTK_WIDGET (rpm_verify_window);
@@ -195,7 +195,7 @@ nautilus_rpm_verify_window_new (const char *package_name)
 void
 nautilus_rpm_verify_window_set_message (NautilusRPMVerifyWindow *window, const char *message)
 {
-	nautilus_label_set_text (NAUTILUS_LABEL (window->details->file_message), message);
+	eel_label_set_text (EEL_LABEL (window->details->file_message), message);
         while (gtk_events_pending ()) {
                 gtk_main_iteration ();
         }
diff --git a/components/rpmview/nautilus-rpm-view-install.c b/components/rpmview/nautilus-rpm-view-install.c
index 06be5685d..ef2b53a05 100644
--- a/components/rpmview/nautilus-rpm-view-install.c
+++ b/components/rpmview/nautilus-rpm-view-install.c
@@ -23,8 +23,8 @@
 #include "nautilus-rpm-view-install.h"
 #include "libtrilobite/libtrilobite.h"
 #include "libeazelinstall.h"
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-password-dialog.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-password-dialog.h>
 #include "libtrilobite/libtrilobite.h"
 #include "nautilus-rpm-view-private.h"
 #ifdef EAZEL_SERVICES
@@ -231,7 +231,7 @@ nautilus_rpm_view_install_done (EazelInstallCallback *service,
 		window = gtk_widget_get_toplevel (GTK_WIDGET (rpm_view));
 		g_assert (window);
 		g_assert (GTK_IS_WINDOW (window));
-		d = nautilus_show_error_dialog_with_details (terse, 
+		d = eel_show_error_dialog_with_details (terse, 
 							     dialog_title,
 							     detailed,
 							     GTK_WINDOW (window));
@@ -291,16 +291,16 @@ nautilus_service_need_password (GtkObject *object, const char *prompt,
 		message = _("Incorrect password.");
 	}
 
-	dialog = nautilus_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
-	okay = nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (dialog));
+	dialog = eel_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
+	okay = eel_password_dialog_run_and_block (EEL_PASSWORD_DIALOG (dialog));
 
 	if (! okay) {
 		/* cancel */
 		view->details->password_attempts = 0;
 		out = g_strdup ("");
 	} else {
-		out = nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (dialog));
-		if (nautilus_password_dialog_get_remember (NAUTILUS_PASSWORD_DIALOG (dialog))) {
+		out = eel_password_dialog_get_password (EEL_PASSWORD_DIALOG (dialog));
+		if (eel_password_dialog_get_remember (EEL_PASSWORD_DIALOG (dialog))) {
 			view->details->remembered_password = g_strdup (out);
 		}
 	}
diff --git a/components/rpmview/nautilus-rpm-view.c b/components/rpmview/nautilus-rpm-view.c
index 7f7a24652..00bf40cf8 100644
--- a/components/rpmview/nautilus-rpm-view.c
+++ b/components/rpmview/nautilus-rpm-view.c
@@ -34,18 +34,18 @@
 #include <gnome.h>
 #include <gtk/gtklabel.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-ctree.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
 #include <libnautilus-extensions/nautilus-metadata.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-viewport.h>
 #include <libnautilus/libnautilus.h>
 #include <limits.h>
 #include <stdio.h>
@@ -85,7 +85,7 @@ static void nautilus_rpm_view_verify_package_callback (GtkWidget *widget,
 static void file_activation_callback (NautilusCTree *ctree, NautilusCTreeNode *node, int column,
                                       NautilusRPMView *rpm_view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusRPMView, nautilus_rpm_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusRPMView, nautilus_rpm_view, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_rpm_view_initialize_class (NautilusRPMViewClass *klass)
@@ -105,7 +105,7 @@ nautilus_rpm_view_initialize_class (NautilusRPMViewClass *klass)
 static void
 nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 {
-  	NautilusBackground *background;
+  	EelBackground *background;
 	GtkWidget *temp_box, *temp_widget;
 	GtkWidget *icon_title_box, *title_box;
 	GtkTable *table;
@@ -132,8 +132,8 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	rpm_view->details->selected_file = NULL;
 	
 	/* set up the default background color */
-  	background = nautilus_get_widget_background (GTK_WIDGET (rpm_view));
-  	nautilus_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
+  	background = eel_get_widget_background (GTK_WIDGET (rpm_view));
+  	eel_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
 	 
 	/* allocate a vbox to contain all of the views */
 	
@@ -148,7 +148,7 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	
 	/* allocate a nautilus_image to hold the icon */
 	default_icon_path = nautilus_theme_get_image_path ("gnome-pack-rpm.png");
-	rpm_view->details->package_image = nautilus_image_new (default_icon_path);
+	rpm_view->details->package_image = eel_image_new (default_icon_path);
 	g_free (default_icon_path);
 	gtk_widget_show (rpm_view->details->package_image);
 	gtk_box_pack_start (GTK_BOX (icon_title_box), rpm_view->details->package_image, FALSE, FALSE, 8);	
@@ -160,7 +160,7 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	
 	/* allocate the name field */
 	rpm_view->details->package_title = gtk_label_new (_("Package Title"));
-        nautilus_gtk_label_make_larger (GTK_LABEL (rpm_view->details->package_title), 4);
+        eel_gtk_label_make_larger (GTK_LABEL (rpm_view->details->package_title), 4);
 	gtk_box_pack_start (GTK_BOX (title_box), rpm_view->details->package_title, FALSE, FALSE, 1);	
 	gtk_widget_show (rpm_view->details->package_title);
 		
@@ -357,11 +357,11 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
         temp_widget = gtk_scrolled_window_new (NULL, NULL);
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (temp_widget),
                                         GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-        viewport = nautilus_viewport_new (NULL, NULL);
+        viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
         gtk_container_add (GTK_CONTAINER (temp_widget), viewport);
-	background = nautilus_get_widget_background (viewport);
-	nautilus_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
+	background = eel_get_widget_background (viewport);
+	eel_background_set_color (background, RPM_VIEW_DEFAULT_BACKGROUND_COLOR);
         gtk_widget_show (viewport);
         gtk_box_pack_start (GTK_BOX (rpm_view->details->package_container), temp_widget, TRUE, TRUE, 8);
         gtk_widget_show (temp_widget);
@@ -375,7 +375,7 @@ nautilus_rpm_view_initialize (NautilusRPMView *rpm_view)
 	
 	gtk_drag_dest_set (GTK_WIDGET (rpm_view),
 			   GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP, 
-			   rpm_dnd_target_table, NAUTILUS_N_ELEMENTS (rpm_dnd_target_table), GDK_ACTION_COPY);
+			   rpm_dnd_target_table, EEL_N_ELEMENTS (rpm_dnd_target_table), GDK_ACTION_COPY);
 
 	/* finally, show the view itself */	
 	gtk_widget_show (GTK_WIDGET (rpm_view));
@@ -416,7 +416,7 @@ nautilus_rpm_view_destroy (GtkObject *object)
 	g_free (rpm_view->details->package_name);
 	g_free (rpm_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* Component embedding support */
@@ -536,7 +536,7 @@ nautilus_rpm_view_update_from_uri (NautilusRPMView *rpm_view, const char *uri)
 		
 	/* load the standard icon as the default */
 	default_icon_path = nautilus_theme_get_image_path ("gnome-pack-rpm.png");
-    	nautilus_image_set_pixbuf_from_file_name (NAUTILUS_IMAGE (rpm_view->details->package_image), default_icon_path);
+    	eel_image_set_pixbuf_from_file_name (EEL_IMAGE (rpm_view->details->package_image), default_icon_path);
         g_free (default_icon_path);
 
 #ifdef EAZEL_SERVICES	       
@@ -733,7 +733,7 @@ nautilus_rpm_view_verify_files (GtkWidget *widget,
 	
 	}
 	
-	nautilus_gtk_window_present (GTK_WINDOW (rpm_view->details->verify_window));
+	eel_gtk_window_present (GTK_WINDOW (rpm_view->details->verify_window));
 
         failsignal = gtk_signal_connect (GTK_OBJECT (rpm_view->details->package_system),
                                          "failed",
@@ -781,7 +781,7 @@ nautilus_rpm_view_drag_data_received (GtkWidget *widget, GdkDragContext *context
         switch (info) {
         case TARGET_COLOR:
                 /* Let the background change based on the dropped color. */
-                nautilus_background_receive_dropped_color (nautilus_get_widget_background (widget),
+                eel_background_receive_dropped_color (eel_get_widget_background (widget),
                                                            widget, x, y, selection_data);
                 break;
                 
diff --git a/components/sample/nautilus-sample-content-view.c b/components/sample/nautilus-sample-content-view.c
index 2b37b6ac7..41b5c2bca 100644
--- a/components/sample/nautilus-sample-content-view.c
+++ b/components/sample/nautilus-sample-content-view.c
@@ -39,7 +39,7 @@
  * Nautilus. If not, you can't rely on the nautilus-gtk-macros.h header.
  */
 #if 0
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #endif
 
 #include <libnautilus/nautilus-bonobo-ui.h>
@@ -77,7 +77,7 @@ static void sample_merge_bonobo_items_callback            (BonoboControl
 
 #if 0
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSampleContentView,
 				   nautilus_sample_content_view,
 				   NAUTILUS_TYPE_VIEW)
 #else
@@ -166,7 +166,7 @@ nautilus_sample_content_view_destroy (GtkObject *object)
 
 	/* CHANGE: Pick one. */
 #if 0 /* nautilus-specific */	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 #else /* non-nautilus-specific */
 	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 #endif
diff --git a/components/services/install-view/Makefile.am b/components/services/install-view/Makefile.am
index d6f5bc368..e7108d5ef 100644
--- a/components/services/install-view/Makefile.am
+++ b/components/services/install-view/Makefile.am
@@ -14,6 +14,8 @@ INCLUDES =								\
 	-I$(top_builddir)/components/services/install/lib		\
 	-I$(top_builddir)/components/services/inventory/		\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS)							\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
 	$(GNOMEUI_CFLAGS)						\
@@ -44,6 +46,8 @@ nautilus_service_install_view_LDADD =								\
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la		\
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a	\
 	$(top_builddir)/components/services/inventory/libtrilobite-inventory-service.la		\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)										\
 	$(GCONF_LIBS)										\
 	$(GNOMEUI_LIBS)										\
diff --git a/components/services/install-view/callbacks.c b/components/services/install-view/callbacks.c
index 7c1d901f0..9c7760e06 100644
--- a/components/services/install-view/callbacks.c
+++ b/components/services/install-view/callbacks.c
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <libeazelinstall.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 
 #define MAX_DESCRIBE_MENUS      3
@@ -240,7 +240,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 		im = view->details->current_im = install_message_new (view, pack->name);
 		gtk_progress_set_percentage (GTK_PROGRESS (im->progress_bar), 0.0);
 		out = g_strdup_printf (_("0K of %dK"), total/1024);
-		nautilus_label_set_text (NAUTILUS_LABEL (im->progress_label), out);
+		eel_label_set_text (EEL_LABEL (im->progress_label), out);
 		g_free (out);
 		view->details->last_k = 0;
 
@@ -251,7 +251,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 		} else {
 			out = g_strdup_printf (_("Attempting to download package \"%s\"."), pack->name);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 	} else if (amount == total) {
 		/* done! */
@@ -268,7 +268,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 		} else {
 			out = g_strdup_printf (_("The package \"%s\" has been successfully downloaded."), pack->name);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 		g_free (view->details->current_rpm);
 		view->details->current_rpm = NULL;
@@ -285,7 +285,7 @@ nautilus_service_install_download_progress (EazelInstallCallback *cb, const Pack
 						     (float) amount / (float) total);
 			if ((amount/1024) >= view->details->last_k + 10) {
 				out = g_strdup_printf (_("%dK of %dK"), amount/1024, total/1024);
-				nautilus_label_set_text (NAUTILUS_LABEL (im->progress_label), out);
+				eel_label_set_text (EEL_LABEL (im->progress_label), out);
 				g_free (out);
 				view->details->last_k = (amount/1024);
 			}
@@ -316,7 +316,7 @@ nautilus_service_install_download_failed (EazelInstallCallback *cb, const Packag
 	out = g_strdup_printf (_("Download of package \"%s\" failed!"), tmp);
 	g_free (tmp);
 	if (view->details->current_im != NULL) {
-		nautilus_label_set_text (NAUTILUS_LABEL (view->details->current_im->label), out);
+		eel_label_set_text (EEL_LABEL (view->details->current_im->label), out);
 	}
 	g_free (out);
 }
@@ -340,7 +340,7 @@ previous_install_finished (NautilusServiceInstallView *view)
 		} else {
 			out = g_strdup_printf (_("\"%s\" has been successfully downloaded and installed."), view->details->current_rpm);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 	}
 	g_free (view->details->current_rpm);
@@ -398,7 +398,7 @@ nautilus_service_install_progress (EazelInstallCallback *cb, const PackageData *
 		} else {
 			out = g_strdup_printf (_("Now installing package \"%s\"."), pack->name);
 		}
-		nautilus_label_set_text (NAUTILUS_LABEL (im->label), out);
+		eel_label_set_text (EEL_LABEL (im->label), out);
 		g_free (out);
 
 		view->details->current_package = current_package;
@@ -413,7 +413,7 @@ nautilus_service_install_progress (EazelInstallCallback *cb, const PackageData *
 	gtk_progress_set_percentage (GTK_PROGRESS (im->progress_bar), complete);
 	gtk_progress_set_percentage (GTK_PROGRESS (view->details->total_progress_bar), overall_complete);
 	out = g_strdup_printf (_("%d%%"), (int)(complete*100.0));
-	nautilus_label_set_text (NAUTILUS_LABEL (im->progress_label), out);
+	eel_label_set_text (EEL_LABEL (im->progress_label), out);
 	g_free (out);
 
 	if ((package_progress == package_total) && (package_total > 0)) {
diff --git a/components/services/install-view/forms.c b/components/services/install-view/forms.c
index e415f898f..1f803b78e 100644
--- a/components/services/install-view/forms.c
+++ b/components/services/install-view/forms.c
@@ -30,9 +30,9 @@
 #include "eazel-services-header.h"
 #include "eazel-services-extensions.h"
 #include <stdio.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-background.h>
+#include <eel/eel-label.h>
+#include <eel/eel-viewport.h>
 
 
 /* gtk rulez */
@@ -65,15 +65,15 @@ static GtkWidget *
 horizontal_line_new (int height)
 {
 	GtkWidget *line;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	line = gtk_drawing_area_new ();
 	gtk_drawing_area_size (GTK_DRAWING_AREA (line), 100, 1);
 	gtk_signal_connect (GTK_OBJECT (line), "expose_event", GTK_SIGNAL_FUNC (line_expose), NULL);
 	gtk_widget_set_usize (line, -2, height);
 
-	background = nautilus_get_widget_background (line);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (line);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	return line;
 }
@@ -120,7 +120,7 @@ install_message_new (NautilusServiceInstallView *view, const char *package_name)
 					      EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 					      EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 					      NULL, -2, FALSE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (im->label), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (im->label), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (im->label);
 	im->progress_bar = gtk_progress_bar_new ();
 	gtk_progress_bar_set_bar_style (GTK_PROGRESS_BAR (im->progress_bar), GTK_PROGRESS_CONTINUOUS);
@@ -133,7 +133,7 @@ install_message_new (NautilusServiceInstallView *view, const char *package_name)
 						       EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 						       EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 						       NULL, -2, TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (im->progress_label), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (im->progress_label), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (im->progress_label);
 
 	bogus_label = gtk_label_new ("");
@@ -191,7 +191,7 @@ generate_install_form (NautilusServiceInstallView *view)
 	GtkWidget	*title;
 	GtkWidget	*viewport;
 	GtkWidget	*filler;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	/* allocate the parent box to hold everything */
 	view->details->form = gtk_vbox_new (FALSE, 0);
@@ -214,7 +214,7 @@ generate_install_form (NautilusServiceInstallView *view)
 								EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 								EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 								NULL, 4, TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->package_name), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (view->details->package_name), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->package_name, FALSE, FALSE, 15);
 	gtk_widget_show (view->details->package_name);
 
@@ -226,7 +226,7 @@ generate_install_form (NautilusServiceInstallView *view)
 								   EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 								   EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 								   NULL, -2, TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->package_version), GTK_JUSTIFY_LEFT);
+	eel_label_set_justify (EEL_LABEL (view->details->package_version), GTK_JUSTIFY_LEFT);
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->package_version, FALSE, FALSE, 15);
 	gtk_widget_show (view->details->package_version);
 
@@ -251,8 +251,8 @@ generate_install_form (NautilusServiceInstallView *view)
 									 EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 									 EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 									 NULL, -2, FALSE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->overall_feedback_text), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_text (NAUTILUS_LABEL (view->details->overall_feedback_text), " ");
+	eel_label_set_justify (EEL_LABEL (view->details->overall_feedback_text), GTK_JUSTIFY_LEFT);
+	eel_label_set_text (EEL_LABEL (view->details->overall_feedback_text), " ");
 	gtk_widget_show (view->details->overall_feedback_text);
 	add_padding_to_box (temp_box, 30, 0);
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->overall_feedback_text, TRUE, TRUE, 0);
@@ -268,8 +268,8 @@ generate_install_form (NautilusServiceInstallView *view)
 								   EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 								   EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 								   NULL, -2, FALSE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (view->details->package_details), GTK_JUSTIFY_LEFT);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (view->details->package_details), TRUE);
+	eel_label_set_justify (EEL_LABEL (view->details->package_details), GTK_JUSTIFY_LEFT);
+	eel_label_set_wrap (EEL_LABEL (view->details->package_details), TRUE);
 
 	gtk_box_pack_start (GTK_BOX (temp_box), view->details->package_details, FALSE, FALSE, 15);
 	gtk_widget_show (view->details->package_details);
@@ -278,12 +278,12 @@ generate_install_form (NautilusServiceInstallView *view)
 	view->details->query_pane = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->query_pane),
 					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	viewport = nautilus_viewport_new (NULL, NULL);
+	viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 	gtk_container_add (GTK_CONTAINER (view->details->query_pane), viewport);
 	gtk_widget_show (viewport);
-	background = nautilus_get_widget_background (viewport);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (viewport);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_widget_hide (view->details->query_pane);
 	gtk_box_pack_start (GTK_BOX (view->details->form), view->details->query_pane, TRUE, TRUE, 0);
 
@@ -307,14 +307,14 @@ generate_install_form (NautilusServiceInstallView *view)
 	view->details->pane = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (view->details->pane),
 					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	viewport = nautilus_viewport_new (NULL, NULL);
+	viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 	gtk_container_add (GTK_CONTAINER (view->details->pane), viewport);
 	gtk_widget_show (viewport);
 	gtk_container_add (GTK_CONTAINER (viewport), view->details->message_box);
 	gtk_widget_show (view->details->message_box);
-	background = nautilus_get_widget_background (viewport);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (viewport);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_widget_set_usize (view->details->pane, -2, MESSAGE_BOX_HEIGHT);
 	gtk_widget_show (view->details->pane);
 	gtk_box_pack_end (GTK_BOX (view->details->form), view->details->pane, FALSE, FALSE, 2);
@@ -335,7 +335,7 @@ generate_install_form (NautilusServiceInstallView *view)
 void
 show_overall_feedback (NautilusServiceInstallView *view, char *progress_message)
 {
-	nautilus_label_set_text (NAUTILUS_LABEL (view->details->overall_feedback_text), progress_message);
+	eel_label_set_text (EEL_LABEL (view->details->overall_feedback_text), progress_message);
 	gtk_widget_show (view->details->overall_feedback_text);
 }
 
@@ -345,18 +345,18 @@ update_package_info_display (NautilusServiceInstallView *view, const PackageData
 	char *out;
 
        out = g_strdup_printf (format, pack->name);
-       nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_name), out);
+       eel_label_set_text (EEL_LABEL (view->details->package_name), out);
        g_free (out);
 
        if ((pack->description != NULL) && 
            (strchr (pack->description, '\n') != NULL)) {
-               nautilus_label_set_wrap (NAUTILUS_LABEL (view->details->package_details), FALSE);
+               eel_label_set_wrap (EEL_LABEL (view->details->package_details), FALSE);
        } else {
-               nautilus_label_set_wrap (NAUTILUS_LABEL (view->details->package_details), TRUE);
+               eel_label_set_wrap (EEL_LABEL (view->details->package_details), TRUE);
        }
-       nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_details), pack->description);
+       eel_label_set_text (EEL_LABEL (view->details->package_details), pack->description);
        out = g_strdup_printf (_("Version: %s"), pack->version);
-       nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_version), out);
+       eel_label_set_text (EEL_LABEL (view->details->package_version), out);
        g_free (out);
 }
 
@@ -366,7 +366,7 @@ current_progress_bar_complete (NautilusServiceInstallView *view, const char *tex
 {
 	/* can't figure out a decent way to do this yet... :( */
 	if (view->details->current_im != NULL) {
-		nautilus_label_set_text (NAUTILUS_LABEL (view->details->current_im->progress_label), text);
+		eel_label_set_text (EEL_LABEL (view->details->current_im->progress_label), text);
 		gtk_widget_queue_resize (view->details->message_box);
 	}
 }
@@ -423,16 +423,16 @@ make_query_box (NautilusServiceInstallView *view, EazelInstallCallbackOperation
 					      EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 					      EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 					      NULL, -1, FALSE);
-        nautilus_label_set_text (NAUTILUS_LABEL (top_label), text);
-	nautilus_label_set_justify (NAUTILUS_LABEL (top_label), GTK_JUSTIFY_LEFT);
+        eel_label_set_text (EEL_LABEL (top_label), text);
+	eel_label_set_justify (EEL_LABEL (top_label), GTK_JUSTIFY_LEFT);
         gtk_widget_show (top_label);
 
 	bottom_label_2 = eazel_services_label_new (NULL, 0, 0.0, 0.0, 0, 0,
 						   EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
 						   EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
 						   NULL, -1, FALSE);
-	nautilus_label_set_text (NAUTILUS_LABEL (bottom_label_2), text2);
-	nautilus_label_set_justify (NAUTILUS_LABEL (bottom_label_2), GTK_JUSTIFY_LEFT);
+	eel_label_set_text (EEL_LABEL (bottom_label_2), text2);
+	eel_label_set_justify (EEL_LABEL (bottom_label_2), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (bottom_label_2);
 
         /* build up vbox list of packages */
@@ -444,8 +444,8 @@ make_query_box (NautilusServiceInstallView *view, EazelInstallCallbackOperation
                                                        EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
                                                        EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
                                                        NULL, -1, TRUE);
-                nautilus_label_set_text (NAUTILUS_LABEL (list_label), text);
-                nautilus_label_set_justify (NAUTILUS_LABEL (list_label), GTK_JUSTIFY_LEFT);
+                eel_label_set_text (EEL_LABEL (list_label), text);
+                eel_label_set_justify (EEL_LABEL (list_label), GTK_JUSTIFY_LEFT);
                 gtk_widget_show (list_label);
                 gtk_box_pack_start (GTK_BOX (vbox_list), list_label, FALSE, FALSE, 0);
                 g_free (text);
@@ -469,8 +469,8 @@ make_query_box (NautilusServiceInstallView *view, EazelInstallCallbackOperation
                                                  EAZEL_SERVICES_BODY_TEXT_COLOR_RGB,
                                                  EAZEL_SERVICES_BACKGROUND_COLOR_RGB,
                                                  NULL, -1, FALSE);
-        nautilus_label_set_text (NAUTILUS_LABEL (bottom_label), text);
-	nautilus_label_set_justify (NAUTILUS_LABEL (bottom_label), GTK_JUSTIFY_LEFT);
+        eel_label_set_text (EEL_LABEL (bottom_label), text);
+	eel_label_set_justify (EEL_LABEL (bottom_label), GTK_JUSTIFY_LEFT);
         gtk_widget_show (bottom_label);
         g_free (text);
 
diff --git a/components/services/install-view/nautilus-service-install-view.c b/components/services/install-view/nautilus-service-install-view.c
index 52189a97e..7547217b8 100644
--- a/components/services/install-view/nautilus-service-install-view.c
+++ b/components/services/install-view/nautilus-service-install-view.c
@@ -36,19 +36,19 @@
 
 #include <gnome-xml/tree.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-password-dialog.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-string.h>
+#include <eel/eel-label.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-password-dialog.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-viewport.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-clickable-image.h>
 #include <stdio.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -68,7 +68,7 @@ static void       service_install_load_location_callback         (NautilusView
 static void	  service_install_stop_loading_callback		 (NautilusView				*nautilus_view,
 								  NautilusServiceInstallView		*view);
     
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusServiceInstallView, nautilus_service_install_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusServiceInstallView, nautilus_service_install_view, GTK_TYPE_EVENT_BOX)
 
 
 static gboolean
@@ -105,7 +105,7 @@ nautilus_service_install_view_destroy (GtkObject *object)
 		eazel_install_callback_unref (GTK_OBJECT (view->details->installer));
 	}
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
@@ -125,7 +125,7 @@ nautilus_service_install_view_finalize (GtkObject *object)
 	g_free (view->details->username);
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, finalize, (object));
 }
 
 static void
@@ -148,7 +148,7 @@ static void
 nautilus_service_install_view_initialize (NautilusServiceInstallView *view)
 {
 
-	NautilusBackground *background;
+	EelBackground *background;
 
 	view->details = g_new0 (NautilusServiceInstallViewDetails, 1);
 	view->details->nautilus_view = nautilus_view_new (GTK_WIDGET (view));
@@ -161,8 +161,8 @@ nautilus_service_install_view_initialize (NautilusServiceInstallView *view)
 			    GTK_SIGNAL_FUNC (service_install_stop_loading_callback),
 			    view);
 
-	background = nautilus_get_widget_background (GTK_WIDGET (view));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (view));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	view->details->core_package = FALSE;
 	view->details->deps = g_hash_table_new (g_str_hash, g_str_equal);
@@ -529,7 +529,7 @@ make_dragable_icon_well (NautilusServiceInstallView *view,
 	GdkBitmap *drag_mask;
 	int width, height;
 	GdkPixbuf *scaledicon;
-	NautilusBackground *background;
+	EelBackground *background;
 	static GtkTargetEntry target_table[] = {
 		{ "text/uri-list", 0, 0 }
 	};
@@ -552,8 +552,8 @@ make_dragable_icon_well (NautilusServiceInstallView *view,
 	/* set up the "well" aspect frame */
 	aspectframe = gtk_aspect_frame_new (NULL, 0.5, 0.0, 1, TRUE);
 	gtk_frame_set_shadow_type (GTK_FRAME (aspectframe), GTK_SHADOW_IN);
-	background = nautilus_get_widget_background (GTK_WIDGET (aspectframe));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (aspectframe));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	/* scale icon to fit in an ICON_SIZExICON_SIZE box */
 	width = gdk_pixbuf_get_width (icon);
@@ -571,13 +571,13 @@ make_dragable_icon_well (NautilusServiceInstallView *view,
 	scaledicon = gdk_pixbuf_scale_simple (icon, 
 			width, height, GDK_INTERP_BILINEAR);
 
-	image = nautilus_clickable_image_new (NULL, scaledicon);
-	nautilus_clickable_image_set_prelight (NAUTILUS_CLICKABLE_IMAGE (image),
+	image = eel_clickable_image_new (NULL, scaledicon);
+	eel_clickable_image_set_prelight (EEL_CLICKABLE_IMAGE (image),
 			TRUE);
 
 	eventbox = gtk_event_box_new ();
-	background = nautilus_get_widget_background (GTK_WIDGET (eventbox));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (eventbox));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_widget_show (eventbox);
 	box = gtk_hbox_new (FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (box), 3);
@@ -642,7 +642,7 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G
 
 	s = gnome_unconditional_pixmap_file("gnome-info.png");
 	if (s != NULL) {
-		info_icon = nautilus_image_new (s);
+		info_icon = eel_image_new (s);
 		g_free (s);
 		gtk_widget_show (info_icon);
 		gtk_table_attach (GTK_TABLE (table), info_icon,
@@ -652,10 +652,10 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G
 				0, 0);
 	}
 
-	label = nautilus_label_new (_("Installation Complete"));
-	nautilus_label_set_is_smooth (NAUTILUS_LABEL (label), FALSE);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), FALSE);
-	nautilus_label_make_bold (NAUTILUS_LABEL (label));
+	label = eel_label_new (_("Installation Complete"));
+	eel_label_set_is_smooth (EEL_LABEL (label), FALSE);
+	eel_label_set_wrap (EEL_LABEL (label), FALSE);
+	eel_label_make_bold (EEL_LABEL (label));
 	gtk_widget_show (label);
 	alignment = gtk_alignment_new (0.0, 0.5, 0.0, 0.0);
 	gtk_container_add (GTK_CONTAINER (alignment), label);
@@ -720,12 +720,12 @@ nautilus_install_service_add_menu_launchers (NautilusServiceInstallView *view, G
 					menu_description, dentry->name);
 		}
 		g_free (menu_description);
-		label = nautilus_label_new (label_text);
+		label = eel_label_new (label_text);
 		gtk_widget_set_usize (label, 400, -1);
-		nautilus_label_set_is_smooth (NAUTILUS_LABEL (label), FALSE);
-		nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-		nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
-		nautilus_label_set_adjust_wrap_on_resize (NAUTILUS_LABEL (label), TRUE);
+		eel_label_set_is_smooth (EEL_LABEL (label), FALSE);
+		eel_label_set_wrap (EEL_LABEL (label), TRUE);
+		eel_label_set_justify (EEL_LABEL (label), GTK_JUSTIFY_LEFT);
+		eel_label_set_adjust_wrap_on_resize (EEL_LABEL (label), TRUE);
 		gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
 		gtk_widget_show (label);
 		g_free (label_text);
@@ -775,8 +775,8 @@ nautilus_service_need_password (GtkObject *object, const char *prompt, NautilusS
 		message = g_strdup (PASSWORD_PROMPT);
 	}
 
-	dialog = nautilus_password_dialog_new (_("Authenticate as root"), message, prompt, "", TRUE);
-	okay = nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (dialog));
+	dialog = eel_password_dialog_new (_("Authenticate as root"), message, prompt, "", TRUE);
+	okay = eel_password_dialog_run_and_block (EEL_PASSWORD_DIALOG (dialog));
 
 	if (! okay) {
 		/* cancel */
@@ -784,8 +784,8 @@ nautilus_service_need_password (GtkObject *object, const char *prompt, NautilusS
 		view->details->cancelled = TRUE;
 		out = g_strdup ("");
 	} else {
-		out = nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (dialog));
-		if (nautilus_password_dialog_get_remember (NAUTILUS_PASSWORD_DIALOG (dialog))) {
+		out = eel_password_dialog_get_password (EEL_PASSWORD_DIALOG (dialog));
+		if (eel_password_dialog_get_remember (EEL_PASSWORD_DIALOG (dialog))) {
 			view->details->remembered_password = g_strdup (out);
 		}
 	}
@@ -900,7 +900,7 @@ nautilus_service_install_view_update_from_uri_finish (NautilusServiceInstallView
 	} else {
 		out = g_strdup_printf (_("Installing some package"));
 	}
-	nautilus_label_set_text (NAUTILUS_LABEL (view->details->package_name), out);
+	eel_label_set_text (EEL_LABEL (view->details->package_name), out);
 	g_free (out);
 
 	CORBA_exception_init (&ev);
diff --git a/components/services/install/lib/eazel-install-logic2.c b/components/services/install/lib/eazel-install-logic2.c
index 7aaff78e7..18d792c76 100644
--- a/components/services/install/lib/eazel-install-logic2.c
+++ b/components/services/install/lib/eazel-install-logic2.c
@@ -28,7 +28,7 @@
 #include <libtrilobite/trilobite-core-utils.h>
 #include <libtrilobite/trilobite-md5-tools.h>
 
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 
 #ifndef EAZEL_INSTALL_NO_CORBA
 #include <libtrilobite/libtrilobite.h>
diff --git a/components/services/install/server/main.c b/components/services/install/server/main.c
index b02e114cb..f458252e4 100644
--- a/components/services/install/server/main.c
+++ b/components/services/install/server/main.c
@@ -37,7 +37,7 @@
 	$(top_builddir)/libnautilus-extensions/nautilus-debug.o				 	\
 to the ldadd line in Makefile.am
 */
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #endif
 
 #include <trilobite-eazel-install.h>
@@ -156,7 +156,7 @@ int main(int argc, char *argv[]) {
 	}
 
 #ifdef STOP_IN_DEBUG
-	nautilus_make_warnings_and_criticals_stop_in_debugger ("GLib", NULL);
+	eel_make_warnings_and_criticals_stop_in_debugger ("GLib", NULL);
 #endif
 
 	do {
diff --git a/components/services/inventory-view/Makefile.am b/components/services/inventory-view/Makefile.am
index 073eeb594..3903f857b 100644
--- a/components/services/inventory-view/Makefile.am
+++ b/components/services/inventory-view/Makefile.am
@@ -10,6 +10,8 @@ INCLUDES =						\
 	-I$(top_srcdir)/components/services/inventory	\
 	-I$(top_builddir)/components/services/inventory	\
 	-I$(top_srcdir)/components/services/nautilus-dependent-shared   \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)				\
 	$(BONOBO_CFLAGS)				\
 	$(OAF_CFLAGS)
@@ -38,6 +40,8 @@ nautilus_inventory_view_LDADD =								\
 	$(top_builddir)/components/services/inventory/libtrilobite-inventory-service.la	\
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la 		\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(GNOMEUI_LIBS)									\
 	$(BONOBO_LIBS)									\
 	$(GCONF_LIBS)									\
diff --git a/components/services/inventory-view/nautilus-inventory-config-page.c b/components/services/inventory-view/nautilus-inventory-config-page.c
index 53bdbfadc..798724983 100644
--- a/components/services/inventory-view/nautilus-inventory-config-page.c
+++ b/components/services/inventory-view/nautilus-inventory-config-page.c
@@ -32,7 +32,7 @@
 #include <gtk/gtkentry.h>
 #include <gtk/gtksignal.h>
 #include <gtk/gtkcheckbutton.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus/nautilus-view.h>
 #include <eazel-inventory-service-interface.h>
 
@@ -49,7 +49,7 @@ static void     nautilus_inventory_config_page_initialize_class    (NautilusInve
 static void     nautilus_inventory_config_page_initialize          (NautilusInventoryConfigPage      *file);
 static void     nautilus_inventory_config_page_destroy             (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryConfigPage, nautilus_inventory_config_page, GTK_TYPE_VBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryConfigPage, nautilus_inventory_config_page, GTK_TYPE_VBOX)
 
 static void
 nautilus_inventory_config_page_initialize_class (NautilusInventoryConfigPageClass *klass)
@@ -186,5 +186,5 @@ nautilus_inventory_config_page_destroy (GtkObject *object)
 	
 	g_free (page->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
diff --git a/components/services/inventory-view/nautilus-inventory-disable-page.c b/components/services/inventory-view/nautilus-inventory-disable-page.c
index a4c3aa53a..157c73d45 100644
--- a/components/services/inventory-view/nautilus-inventory-disable-page.c
+++ b/components/services/inventory-view/nautilus-inventory-disable-page.c
@@ -36,9 +36,9 @@
 #include <gtk/gtkprogressbar.h>
 #include <gtk/gtk.h>
 #include <gnome.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
+#include <eel/eel-background.h>
 #include <libnautilus/nautilus-view.h>
 #include <eazel-inventory.h>
 
@@ -51,7 +51,7 @@ static void     nautilus_inventory_disable_page_initialize_class    (NautilusInv
 static void     nautilus_inventory_disable_page_initialize          (NautilusInventoryDisablePage      *file);
 static void     nautilus_inventory_disable_page_destroy             (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryDisablePage, nautilus_inventory_disable_page, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryDisablePage, nautilus_inventory_disable_page, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_inventory_disable_page_initialize_class (NautilusInventoryDisablePageClass *klass)
@@ -84,7 +84,7 @@ disable_inventory_callback (gpointer data)
 static void
 nautilus_inventory_disable_page_initialize (NautilusInventoryDisablePage *disable_page)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	GtkWidget *header;
 	GtkWidget *vbox;
 	GtkWidget *label;
@@ -93,8 +93,8 @@ nautilus_inventory_disable_page_initialize (NautilusInventoryDisablePage *disabl
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (disable_page), vbox);
 
-	background = nautilus_get_widget_background (GTK_WIDGET (disable_page));
-        nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (disable_page));
+        eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	disable_page->details = g_new0 (NautilusInventoryDisablePageDetails, 1);
 
@@ -110,8 +110,8 @@ nautilus_inventory_disable_page_initialize (NautilusInventoryDisablePage *disabl
 					       0.5,
 					       0,
 					       0,
-					       NAUTILUS_RGB_COLOR_BLACK,
-					       NAUTILUS_RGB_COLOR_WHITE,
+					       EEL_RGB_COLOR_BLACK,
+					       EEL_RGB_COLOR_WHITE,
 					       NULL,
 					       4,		/*relative size*/
 					       TRUE);
@@ -147,7 +147,7 @@ nautilus_inventory_disable_page_destroy (GtkObject *object)
 	}
 	g_free (page->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 void
diff --git a/components/services/inventory-view/nautilus-inventory-enable-page.c b/components/services/inventory-view/nautilus-inventory-enable-page.c
index 5b1d972b7..dd4abc6f9 100644
--- a/components/services/inventory-view/nautilus-inventory-enable-page.c
+++ b/components/services/inventory-view/nautilus-inventory-enable-page.c
@@ -33,11 +33,11 @@
 
 #include <gnome.h>
 #include <gtk/gtkprogressbar.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
 #include <libnautilus/nautilus-view.h>
 #include <eazel-inventory.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 
 
 #undef DEBUG_MESSAGES
@@ -61,7 +61,7 @@ static void     nautilus_inventory_enable_page_initialize_class    (NautilusInve
 static void     nautilus_inventory_enable_page_initialize          (NautilusInventoryEnablePage      *file);
 static void     nautilus_inventory_enable_page_destroy             (GtkObject                        *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryEnablePage, nautilus_inventory_enable_page, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryEnablePage, nautilus_inventory_enable_page, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_inventory_enable_page_initialize_class (NautilusInventoryEnablePageClass *klass)
@@ -110,7 +110,7 @@ nautilus_inventory_enable_page_initialize (NautilusInventoryEnablePage *enable_p
 
 	gtk_container_add (GTK_CONTAINER (enable_page), vbox_top);
 	
-        nautilus_background_set_color (nautilus_get_widget_background (GTK_WIDGET (enable_page)), 
+        eel_background_set_color (eel_get_widget_background (GTK_WIDGET (enable_page)), 
         	EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	header = eazel_services_header_title_new (_("Uploading your System Inventory..."));
@@ -130,8 +130,8 @@ nautilus_inventory_enable_page_initialize (NautilusInventoryEnablePage *enable_p
 					       0.5,
 					       0,
 					       0,
-					       NAUTILUS_RGB_COLOR_BLACK,
-					       NAUTILUS_RGB_COLOR_WHITE,
+					       EEL_RGB_COLOR_BLACK,
+					       EEL_RGB_COLOR_WHITE,
 					       NULL,
 					       4,		/*relative size*/
 					       TRUE);
@@ -203,10 +203,10 @@ callback_eazel_inventory (EazelInventory *inventory,
 		nautilus_view_open_location_in_this_window (NAUTILUS_VIEW (enable_page->details->view),
 						    enable_page->details->view->details->next_uri);
 	} else {
-		nautilus_label_set_wrap (NAUTILUS_LABEL (enable_page->details->label), TRUE);
-		nautilus_label_set_justify (NAUTILUS_LABEL (enable_page->details->label), GTK_JUSTIFY_CENTER);
+		eel_label_set_wrap (EEL_LABEL (enable_page->details->label), TRUE);
+		eel_label_set_justify (EEL_LABEL (enable_page->details->label), GTK_JUSTIFY_CENTER);
 
-		nautilus_label_set_text (NAUTILUS_LABEL (enable_page->details->label), _("I'm sorry, an error prevented your System Inventory from being uploaded\n"));
+		eel_label_set_text (EEL_LABEL (enable_page->details->label), _("I'm sorry, an error prevented your System Inventory from being uploaded\n"));
 		/* Pause for impact */
 		/* This ref is released in the callback function */
 		gtk_object_ref (GTK_OBJECT (enable_page));
@@ -260,6 +260,6 @@ nautilus_inventory_enable_page_destroy (GtkObject *object)
 	}
 	g_free (enable_page->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
diff --git a/components/services/inventory-view/nautilus-inventory-view.c b/components/services/inventory-view/nautilus-inventory-view.c
index 12026f9c1..1b1bd2b7d 100644
--- a/components/services/inventory-view/nautilus-inventory-view.c
+++ b/components/services/inventory-view/nautilus-inventory-view.c
@@ -32,9 +32,9 @@
 
 #include "eazel-services-extensions.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-background.h>
+#include <eel/eel-string.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
 #include <bonobo/bonobo-control.h>
@@ -60,7 +60,7 @@ static void inventory_load_location_callback         (NautilusView
 						      gpointer                    user_data);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusInventoryView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusInventoryView,
 				   nautilus_inventory_view,
 				   NAUTILUS_TYPE_VIEW)
 
@@ -118,7 +118,7 @@ nautilus_inventory_view_destroy (GtkObject *object)
 	
 	g_free (view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
@@ -160,7 +160,7 @@ inventory_load_location_callback (NautilusView *nautilus_view,
 
 	DEBUG_MSG (("%s: load_location '%s'\n", __FUNCTION__, location));
 
-	if (nautilus_istr_has_prefix (location, "eazel-inventory:enable")) {
+	if (eel_istr_has_prefix (location, "eazel-inventory:enable")) {
 		view->details->next_uri = get_finish_uri (location, "eazel:");
 
 		DEBUG_MSG (("%s: enabling, next_uri is '%s'\n", __FUNCTION__, view->details->next_uri));
@@ -169,7 +169,7 @@ inventory_load_location_callback (NautilusView *nautilus_view,
 		nautilus_view_report_load_complete (nautilus_view);
 		nautilus_inventory_enable_page_run (
 			NAUTILUS_INVENTORY_ENABLE_PAGE (view->details->enable_page));
-	} else if (nautilus_istr_has_prefix (location, "eazel-inventory:disable")) {
+	} else if (eel_istr_has_prefix (location, "eazel-inventory:disable")) {
 		view->details->next_uri = get_finish_uri (location, "eazel:");
 
 		DEBUG_MSG (("%s: disabling, next_uri is '%s'\n", __FUNCTION__, view->details->next_uri));
diff --git a/components/services/inventory/Makefile.am b/components/services/inventory/Makefile.am
index ec7f50256..c21e5d956 100644
--- a/components/services/inventory/Makefile.am
+++ b/components/services/inventory/Makefile.am
@@ -19,6 +19,8 @@ INCLUDES =								\
 	-I$(top_builddir)/components/services/trilobite/libtrilobite	\
 	-I$(top_builddir)/libnautilus-extensions	 		\
 	-I$(top_srcdir)/libnautilus-extensions	 			\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GCONF_CFLAGS) 						\
 	$(GNOME_CFLAGS) 						\
 	$(GNOME_INCLUDEDIR) 						\
@@ -49,6 +51,8 @@ trilobite_inventory_service_LDADD =								\
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite-service.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la			\
 	$(top_builddir)/libnautilus/libnautilus.la						\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)										\
 	$(AMMONITE_LIBS)									\
 	$(GHTTP_LIBS)										\
diff --git a/components/services/inventory/eazel-inventory-upload-callback.c b/components/services/inventory/eazel-inventory-upload-callback.c
index 32d099e15..734fe38f9 100644
--- a/components/services/inventory/eazel-inventory-upload-callback.c
+++ b/components/services/inventory/eazel-inventory-upload-callback.c
@@ -30,7 +30,7 @@
 
 #include <bonobo/bonobo-main.h>
 #include <gtk/gtksignal.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 struct EazelInventoryUploadCallbackDetails {
 	EazelInventory *inventory;
@@ -82,7 +82,7 @@ static void eazel_inventory_upload_callback_initialize       (EazelInventoryUplo
 static void eazel_inventory_upload_callback_destroy          (GtkObject                      *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelInventoryUploadCallback,
+EEL_DEFINE_CLASS_BOILERPLATE (EazelInventoryUploadCallback,
 				   eazel_inventory_upload_callback,
 				   BONOBO_OBJECT_TYPE)
 
@@ -122,7 +122,7 @@ eazel_inventory_upload_callback_destroy (GtkObject *object)
 	callback = EAZEL_INVENTORY_UPLOAD_CALLBACK (object);
 	g_free (callback->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/services/inventory/eazel-inventory.c b/components/services/inventory/eazel-inventory.c
index 377490e24..bfc406b13 100644
--- a/components/services/inventory/eazel-inventory.c
+++ b/components/services/inventory/eazel-inventory.c
@@ -24,7 +24,7 @@
 
 #include "eazel-inventory-upload-callback.h"
 #include "eazel-inventory-service-interface.h"
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 #include <bonobo/bonobo-object-client.h>
 
 #define EAZEL_INVENTORY_IID "OAFIID:trilobite_inventory_service:eaae1152-1551-43d5-a764-52274131a9d5"
@@ -39,7 +39,7 @@ static void eazel_inventory_initialize       (EazelInventory      *factory);
 static void eazel_inventory_destroy          (GtkObject                            *object);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelInventory, eazel_inventory, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (EazelInventory, eazel_inventory, GTK_TYPE_OBJECT)
 
 static void
 eazel_inventory_initialize_class  (EazelInventoryClass *klass)
diff --git a/components/services/inventory/main.c b/components/services/inventory/main.c
index 83cad29d6..1d93276fb 100644
--- a/components/services/inventory/main.c
+++ b/components/services/inventory/main.c
@@ -28,7 +28,7 @@
 #include <libgnomeui/gnome-init.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <liboaf/liboaf.h>
 #include <bonobo.h>
 
diff --git a/components/services/login/nautilus-view/Makefile.am b/components/services/login/nautilus-view/Makefile.am
index f2a531334..c58af344c 100644
--- a/components/services/login/nautilus-view/Makefile.am
+++ b/components/services/login/nautilus-view/Makefile.am
@@ -11,6 +11,8 @@ INCLUDES =								\
         -I$(top_builddir)/components/services/trilobite/libtrilobite 	\
 	-I$(top_srcdir)/components/services/login/lib			\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       			\
 	$(GCONF_CFLAGS) 						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
@@ -34,6 +36,8 @@ nautilus_change_password_view_LDADD =						\
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus/libnautilus.la			\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)							\
 	$(GNOMEUI_LIBS)							\
 	$(GCONF_LIBS)							\
diff --git a/components/services/login/nautilus-view/nautilus-change-password-view.c b/components/services/login/nautilus-view/nautilus-change-password-view.c
index 82a48b1bc..818540f24 100644
--- a/components/services/login/nautilus-view/nautilus-change-password-view.c
+++ b/components/services/login/nautilus-view/nautilus-change-password-view.c
@@ -34,17 +34,17 @@
 #include <gnome.h>
 #include <gnome-xml/tree.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-string.h>
+#include <eel/eel-label.h>
+#include <eel/eel-image.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-viewport.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <libtrilobite/eazelproxy.h>
@@ -96,7 +96,7 @@ static void       change_password_button_cb                      (GtkWidget
 static void       maintenance_button_cb                (GtkWidget                  *button,
 							NautilusChangePasswordView          *view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusChangePasswordView, nautilus_change_password_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusChangePasswordView, nautilus_change_password_view, GTK_TYPE_EVENT_BOX)
 
 
 static char *
@@ -142,7 +142,7 @@ generate_change_password_form (NautilusChangePasswordView	*view)
 	GtkWidget	*pane;
 	GtkWidget	*subform;
 	char		*username;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	/* allocate a box to hold everything */
 	view->details->form = gtk_vbox_new (FALSE, 0);
@@ -157,14 +157,14 @@ generate_change_password_form (NautilusChangePasswordView	*view)
 	/* make an opportunistic scrollbar panel for it all */
         pane = gtk_scrolled_window_new (NULL, NULL);
         gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pane), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-	view->details->viewport = nautilus_viewport_new (NULL, NULL);
+	view->details->viewport = eel_viewport_new (NULL, NULL);
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (view->details->viewport), GTK_SHADOW_NONE);
 	gtk_container_add (GTK_CONTAINER (pane), view->details->viewport);
 	gtk_widget_show (view->details->viewport);
 	gtk_container_add (GTK_CONTAINER (view->details->form), pane);
         gtk_widget_show (pane);
-	background = nautilus_get_widget_background (GTK_WIDGET (view->details->viewport));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (view->details->viewport));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	subform = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (view->details->viewport), subform);
@@ -509,7 +509,7 @@ nautilus_change_password_view_initialize_class (NautilusChangePasswordViewClass
 static void
 nautilus_change_password_view_initialize (NautilusChangePasswordView *view)
 {
-	NautilusBackground *background;
+	EelBackground *background;
 	CORBA_Environment ev;
 
 	view->details = g_new0 (NautilusChangePasswordViewDetails, 1);
@@ -520,8 +520,8 @@ nautilus_change_password_view_initialize (NautilusChangePasswordView *view)
 			    GTK_SIGNAL_FUNC (change_password_load_location_callback), 
 			    view);
 
-	background = nautilus_get_widget_background (GTK_WIDGET (view));
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (GTK_WIDGET (view));
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	CORBA_exception_init (&ev);
 	view->details->user_control = (EazelProxy_UserControl) oaf_activate_from_id (IID_EAZELPROXY, 0, NULL, &ev);
@@ -556,7 +556,7 @@ nautilus_change_password_view_destroy (GtkObject *object)
 
 	CORBA_exception_free (&ev);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusView *
diff --git a/components/services/login/nautilus-view/password-box.c b/components/services/login/nautilus-view/password-box.c
index e249daed1..d8af9ee27 100644
--- a/components/services/login/nautilus-view/password-box.c
+++ b/components/services/login/nautilus-view/password-box.c
@@ -28,12 +28,12 @@
 #include "eazel-services-extensions.h"
 
 #include <gnome.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-background.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-label.h>
+#include <eel/eel-image.h>
 #include <stdio.h>
 #include <unistd.h>
 
@@ -78,15 +78,15 @@ static GtkWidget *
 vertical_line_new (int width)
 {
 	GtkWidget *line;
-	NautilusBackground *background;
+	EelBackground *background;
 
 	line = gtk_drawing_area_new ();
 	gtk_drawing_area_size (GTK_DRAWING_AREA (line), 1, 10);
 	gtk_signal_connect (GTK_OBJECT (line), "expose_event", GTK_SIGNAL_FUNC (line_expose), NULL);
 	gtk_widget_set_usize (line, width, -2);
 
-	background = nautilus_get_widget_background (line);
-	nautilus_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	background = eel_get_widget_background (line);
+	eel_background_set_color (background, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 
 	return line;
 }
@@ -109,14 +109,14 @@ make_empty_viewport (void)
 static void
 gtk_widget_set_colors (GtkWidget *widget, int foreground, int background)
 {
-	NautilusBackground *bground;
+	EelBackground *bground;
 	GtkStyle *style;
 	GdkColor *color;
 	char *spec;
 
-	bground = nautilus_get_widget_background (widget);
+	bground = eel_get_widget_background (widget);
 	spec = g_strdup_printf ("#%06X", background);
-	nautilus_background_set_color (bground, spec);
+	eel_background_set_color (bground, spec);
 	g_free (spec);
 
 	/* foreground is much harder */
@@ -182,9 +182,9 @@ change_bubble_shell_colors (GtkWidget *table, int foreground, int background)
 
 	for (iter = gtk_container_children (GTK_CONTAINER (table)); iter != NULL; iter = iter->next) {
 		widget = (GtkWidget *)(iter->data);
-		if (NAUTILUS_IS_IMAGE (widget)) {
+		if (EEL_IS_IMAGE (widget)) {
 			/* images are the little rounded corners arlo drew */
-			nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (widget), background);
+			eel_image_set_solid_background_color (EEL_IMAGE (widget), background);
 		} else {
 			gtk_widget_set_colors (widget, foreground, background);
 		}
@@ -198,18 +198,18 @@ password_box_set_colors (PasswordBox *box, int foreground, int background)
 
         /* if we don't hide/show during the color change, some widgets won't draw correctly [gtk rulez] */
         gtk_widget_hide (box->table);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (box->label), background);
-	nautilus_label_set_solid_background_color (NAUTILUS_LABEL (box->label_right), background);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (box->label), foreground);
-	nautilus_label_set_text_color (NAUTILUS_LABEL (box->label_right), foreground);
-	nautilus_image_set_solid_background_color (NAUTILUS_IMAGE (box->bong), background);
+	eel_label_set_solid_background_color (EEL_LABEL (box->label), background);
+	eel_label_set_solid_background_color (EEL_LABEL (box->label_right), background);
+	eel_label_set_text_color (EEL_LABEL (box->label), foreground);
+	eel_label_set_text_color (EEL_LABEL (box->label_right), foreground);
+	eel_image_set_solid_background_color (EEL_IMAGE (box->bong), background);
 
         /* you DON'T want to know.
          * ... doing this pokes the label enough that it'll wake up and notice its new colors.
          */
-        text = g_strdup (nautilus_label_get_text (NAUTILUS_LABEL (box->label)));
-        nautilus_label_set_text (NAUTILUS_LABEL (box->label), "-");
-        nautilus_label_set_text (NAUTILUS_LABEL (box->label), text);
+        text = g_strdup (eel_label_get_text (EEL_LABEL (box->label)));
+        eel_label_set_text (EEL_LABEL (box->label), "-");
+        eel_label_set_text (EEL_LABEL (box->label), text);
         g_free (text);
 
 	gtk_widget_set_colors (box->line, foreground, background);
@@ -227,7 +227,7 @@ password_box_get_entry (PasswordBox *box)
 void
 password_box_set_error_text (PasswordBox *box, const char *message)
 {
-	nautilus_label_set_text (NAUTILUS_LABEL (box->label_right), message);
+	eel_label_set_text (EEL_LABEL (box->label_right), message);
 }
 
 void
@@ -254,7 +254,7 @@ password_box_new (const char *title)
 					       BUBBLE_FOREGROUND_RGB,
 					       BUBBLE_BACKGROUND_RGB,
 					       NULL, 0, TRUE);
-	nautilus_label_set_text (NAUTILUS_LABEL (box->label), title);
+	eel_label_set_text (EEL_LABEL (box->label), title);
 	gtk_widget_show (box->label);
 
 	/* text entry, offset to the right a bit */
@@ -291,8 +291,8 @@ password_box_new (const char *title)
 						     BUBBLE_FOREGROUND_RGB,
 						     BUBBLE_BACKGROUND_RGB,
 						     NULL, -2, FALSE);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (box->label_right), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (box->label_right), GTK_JUSTIFY_LEFT);
+	eel_label_set_wrap (EEL_LABEL (box->label_right), TRUE);
+	eel_label_set_justify (EEL_LABEL (box->label_right), GTK_JUSTIFY_LEFT);
 	gtk_widget_show (box->label_right);
 
 	/* hbox for all the right-side alert messages */
diff --git a/components/services/nautilus-dependent-shared/Makefile.am b/components/services/nautilus-dependent-shared/Makefile.am
index 02a4e1d29..c0046d3db 100644
--- a/components/services/nautilus-dependent-shared/Makefile.am
+++ b/components/services/nautilus-dependent-shared/Makefile.am
@@ -12,6 +12,8 @@ INCLUDES = \
         -I$(top_builddir)/components/services/trilobite		\
         -I$(top_srcdir)/components/services/trilobite/lib	\
         -I$(top_builddir)/components/services/trilobite/lib	\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOME_CFLAGS)						\
 	$(GCONF_CFLAGS)						\
 	$(XML_CFLAGS)						\
@@ -35,6 +37,8 @@ test_footer_header_LDADD = \
 	$(top_builddir)/components/services/nautilus-dependent-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
 	$(top_builddir)/libnautilus/libnautilus.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS) \
 	$(OAF_LIBS) \
 	$(GCONF_LIBS) \
diff --git a/components/services/nautilus-dependent-shared/eazel-services-extensions.c b/components/services/nautilus-dependent-shared/eazel-services-extensions.c
index 6a183538f..938212a70 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-extensions.c
+++ b/components/services/nautilus-dependent-shared/eazel-services-extensions.c
@@ -30,8 +30,8 @@
 #include <libgnome/gnome-i18n.h>
 
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-string.h>
+#include <eel/eel-clickable-image.h>
 
 #include <time.h>
 
@@ -70,10 +70,10 @@ eazel_services_image_new (const char *icon_name,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	image = nautilus_image_new_solid (pixbuf, 0.5, 0.5, 0, 0, background_color, tile_pixbuf);
+	image = eel_image_new_solid (pixbuf, 0.5, 0.5, 0, 0, background_color, tile_pixbuf);
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return image;
 }
@@ -95,7 +95,7 @@ eazel_services_image_new_clickable (const char *icon_name,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	image = nautilus_clickable_image_new_solid (NULL,
+	image = eel_clickable_image_new_solid (NULL,
 						    pixbuf,
 						    0,
 						    0,
@@ -107,8 +107,8 @@ eazel_services_image_new_clickable (const char *icon_name,
 						    background_color,
 						    tile_pixbuf);
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return image;
 }
@@ -127,11 +127,11 @@ eazel_services_image_new_from_uri (const char *uri,
 	g_return_val_if_fail (uri != NULL, NULL);
 
 	/* load the image - synchronously, at least at first */
-	pixbuf = nautilus_gdk_pixbuf_load (uri);
+	pixbuf = eel_gdk_pixbuf_load (uri);
 	
 	/* pin the image to the specified dimensions if necessary */
 	if (pixbuf && max_width > 0 && max_height > 0) {
-		scaled_pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
+		scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
 		gdk_pixbuf_unref (pixbuf);
 		pixbuf = scaled_pixbuf;
 	}
@@ -140,10 +140,10 @@ eazel_services_image_new_from_uri (const char *uri,
 	image = eazel_services_image_new (NULL, tile_name, background_color);
 
 	if (pixbuf != NULL) {
-		nautilus_image_set_pixbuf (NAUTILUS_IMAGE (image), pixbuf);
+		eel_image_set_pixbuf (EEL_IMAGE (image), pixbuf);
 	}
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
 
 	return image;
 }
@@ -164,11 +164,11 @@ eazel_services_clickable_image_new_from_uri (const char *uri,
 	g_return_val_if_fail (uri != NULL, NULL);
 
 	/* load the image - synchronously, at least at first */
-	pixbuf = nautilus_gdk_pixbuf_load (uri);
+	pixbuf = eel_gdk_pixbuf_load (uri);
 	
 	/* pin the image to the specified dimensions if necessary */
 	if (pixbuf && max_width > 0 && max_height > 0) {
-		scaled_pixbuf = nautilus_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
+		scaled_pixbuf = eel_gdk_pixbuf_scale_down_to_fit (pixbuf, max_width, max_height);
 		gdk_pixbuf_unref (pixbuf);
 		pixbuf = scaled_pixbuf;
 	}
@@ -177,11 +177,11 @@ eazel_services_clickable_image_new_from_uri (const char *uri,
 	image = eazel_services_image_new_clickable (NULL, tile_name, background_color);
 
 	if (pixbuf != NULL) {
-		nautilus_labeled_image_set_pixbuf (NAUTILUS_LABELED_IMAGE (image), 
+		eel_labeled_image_set_pixbuf (EEL_LABELED_IMAGE (image), 
 						   pixbuf);
 	}
 
-	nautilus_gdk_pixbuf_unref_if_not_null (pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (pixbuf);
 
 	return image;
 }
@@ -209,7 +209,7 @@ eazel_services_label_new (const char *text,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	label = nautilus_label_new_solid (text,
+	label = eel_label_new_solid (text,
 					  drop_shadow_offset,
 					  EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB,
 					  text_color,
@@ -222,16 +222,16 @@ eazel_services_label_new (const char *text,
 
 
 	if (num_larger_sizes < 0) {
-		nautilus_label_make_smaller (NAUTILUS_LABEL (label), ABS (num_larger_sizes));
+		eel_label_make_smaller (EEL_LABEL (label), ABS (num_larger_sizes));
 	} else if (num_larger_sizes > 0) {
-		nautilus_label_make_larger (NAUTILUS_LABEL (label), num_larger_sizes);
+		eel_label_make_larger (EEL_LABEL (label), num_larger_sizes);
 	}
 
 	if (bold) {
-		nautilus_label_make_bold (NAUTILUS_LABEL (label));
+		eel_label_make_bold (EEL_LABEL (label));
 	}
 	
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return label;
 }
@@ -256,7 +256,7 @@ eazel_services_label_new_clickable (const char *text,
 		tile_pixbuf = eazel_services_pixbuf_new (tile_name);
 	}
 
-	label = nautilus_clickable_image_new_solid (text,
+	label = eel_clickable_image_new_solid (text,
 						    NULL,
 						    drop_shadow_offset,
 						    EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB,
@@ -269,16 +269,16 @@ eazel_services_label_new_clickable (const char *text,
 						    tile_pixbuf);
 
 	if (num_larger_sizes < 0) {
-		nautilus_labeled_image_make_smaller (NAUTILUS_LABELED_IMAGE (label), ABS (num_larger_sizes));
+		eel_labeled_image_make_smaller (EEL_LABELED_IMAGE (label), ABS (num_larger_sizes));
 	} else if (num_larger_sizes > 0) {
-		nautilus_labeled_image_make_larger (NAUTILUS_LABELED_IMAGE (label), num_larger_sizes);
+		eel_labeled_image_make_larger (EEL_LABELED_IMAGE (label), num_larger_sizes);
 	}
 
 	if (bold) {
-		nautilus_labeled_image_make_bold (NAUTILUS_LABELED_IMAGE (label));
+		eel_labeled_image_make_bold (EEL_LABELED_IMAGE (label));
 	}
 	
-	nautilus_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (tile_pixbuf);
 
 	return label;
 }
@@ -297,5 +297,5 @@ eazel_services_get_current_date_string (void)
 
 	my_localtime = localtime (&my_time);
 
-        return nautilus_strdup_strftime (_("%A, %B %d"), my_localtime);
+        return eel_strdup_strftime (_("%A, %B %d"), my_localtime);
 }
diff --git a/components/services/nautilus-dependent-shared/eazel-services-extensions.h b/components/services/nautilus-dependent-shared/eazel-services-extensions.h
index 818133182..962d536ea 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-extensions.h
+++ b/components/services/nautilus-dependent-shared/eazel-services-extensions.h
@@ -26,16 +26,16 @@
 #define EAZEL_SERVICES_EXTENSIONS_H
 
 #include <libgnome/gnome-defs.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 #define EAZEL_SERVICES_BACKGROUND_COLOR_SPEC		"white"
-#define EAZEL_SERVICES_BACKGROUND_COLOR_RGB		NAUTILUS_RGB_COLOR_WHITE
-#define EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB		NAUTILUS_RGB_COLOR_BLACK
-#define EAZEL_SERVICES_TITLE_TEXT_COLOR_RGB		NAUTILUS_RGB_COLOR_WHITE
-#define EAZEL_SERVICES_BODY_TEXT_COLOR_RGB		NAUTILUS_RGB_COLOR_BLACK
+#define EAZEL_SERVICES_BACKGROUND_COLOR_RGB		EEL_RGB_COLOR_WHITE
+#define EAZEL_SERVICES_DROP_SHADOW_COLOR_RGB		EEL_RGB_COLOR_BLACK
+#define EAZEL_SERVICES_TITLE_TEXT_COLOR_RGB		EEL_RGB_COLOR_WHITE
+#define EAZEL_SERVICES_BODY_TEXT_COLOR_RGB		EEL_RGB_COLOR_BLACK
 
 #define EAZEL_SERVICES_HEADER_TITLE_FILL_ICON		"eazel-logo-left-side-repeat.png"
 #define EAZEL_SERVICES_HEADER_TITLE_LOGO_ICON		"eazel-logo-right-side-logo.png"
diff --git a/components/services/nautilus-dependent-shared/eazel-services-footer.c b/components/services/nautilus-dependent-shared/eazel-services-footer.c
index fb754c276..51295b7f7 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-footer.c
+++ b/components/services/nautilus-dependent-shared/eazel-services-footer.c
@@ -27,11 +27,11 @@
 #include "eazel-services-footer.h"
 #include "eazel-services-extensions.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-theme.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-clickable-image.h>
 
 #include <gtk/gtksignal.h>
 #include <gtk/gtkeventbox.h>
@@ -64,7 +64,7 @@ static void eazel_services_footer_initialize_class (EazelServicesFooterClass *kl
 static void eazel_services_footer_initialize       (EazelServicesFooter      *footer);
 static void footer_destroy                         (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelServicesFooter, eazel_services_footer, GTK_TYPE_HBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (EazelServicesFooter, eazel_services_footer, GTK_TYPE_HBOX)
 
 /* EazelServicesFooterClass methods */
 static void
@@ -113,24 +113,24 @@ footer_destroy (GtkObject *object)
 	
 	footer = EAZEL_SERVICES_FOOTER (object);
 	
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->item_tile);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->item_prelight_tile);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_prelight_pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_tile_pixbuf);
-	nautilus_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_prelight_tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->item_tile);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->item_prelight_tile);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->left_bumper_tile_prelight_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_tile_pixbuf);
+	eel_gdk_pixbuf_unref_if_not_null (footer->details->right_bumper_prelight_tile_pixbuf);
 
 	g_free (footer->details);
 
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static void
 footer_item_clicked_callback (GtkWidget *widget,
 			      gpointer callback_data)
 {
-	g_return_if_fail (NAUTILUS_IS_CLICKABLE_IMAGE (widget));
+	g_return_if_fail (EEL_IS_CLICKABLE_IMAGE (widget));
 	g_return_if_fail (EAZEL_SERVICES_IS_FOOTER (callback_data));
 
 	gtk_signal_emit (GTK_OBJECT (callback_data),
@@ -143,25 +143,25 @@ footer_item_enter_callback (GtkWidget *widget,
 			     gpointer callback_data)
 {
 	EazelServicesFooter *footer;
-	NautilusLabeledImage *label;
-	NautilusLabeledImage *left_bumper;
-	NautilusLabeledImage *right_bumper;
+	EelLabeledImage *label;
+	EelLabeledImage *left_bumper;
+	EelLabeledImage *right_bumper;
 
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
 	g_return_if_fail (EAZEL_SERVICES_IS_FOOTER (callback_data));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
 
 	footer = EAZEL_SERVICES_FOOTER (callback_data);
 
-	left_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
-	label = NAUTILUS_LABELED_IMAGE (widget);
-	right_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
+	left_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
+	label = EEL_LABELED_IMAGE (widget);
+	right_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
 
-	nautilus_labeled_image_set_tile_pixbuf (label, footer->details->item_prelight_tile);
-	nautilus_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_prelight_pixbuf);
-	nautilus_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_prelight_tile_pixbuf);
+	eel_labeled_image_set_tile_pixbuf (label, footer->details->item_prelight_tile);
+	eel_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_prelight_pixbuf);
+	eel_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_prelight_tile_pixbuf);
 }
 
 static void
@@ -169,25 +169,25 @@ footer_item_leave_callback (GtkWidget *widget,
 			     gpointer callback_data)
 {
 	EazelServicesFooter *footer;
-	NautilusLabeledImage *label;
-	NautilusLabeledImage *left_bumper;
-	NautilusLabeledImage *right_bumper;
+	EelLabeledImage *label;
+	EelLabeledImage *left_bumper;
+	EelLabeledImage *right_bumper;
 
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
 	g_return_if_fail (EAZEL_SERVICES_IS_FOOTER (callback_data));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (widget));
-	g_return_if_fail (NAUTILUS_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper")));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (widget));
+	g_return_if_fail (EEL_IS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper")));
 
 	footer = EAZEL_SERVICES_FOOTER (callback_data);
 
-	left_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
-	label = NAUTILUS_LABELED_IMAGE (widget);
-	right_bumper = NAUTILUS_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
+	left_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "left-bumper"));
+	label = EEL_LABELED_IMAGE (widget);
+	right_bumper = EEL_LABELED_IMAGE (gtk_object_get_data (GTK_OBJECT (widget), "right-bumper"));
 
-	nautilus_labeled_image_set_tile_pixbuf (label, footer->details->item_tile);
-	nautilus_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_pixbuf);
-	nautilus_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_tile_pixbuf);
+	eel_labeled_image_set_tile_pixbuf (label, footer->details->item_tile);
+	eel_labeled_image_set_pixbuf (left_bumper, footer->details->left_bumper_tile_pixbuf);
+	eel_labeled_image_set_pixbuf (right_bumper, footer->details->right_bumper_tile_pixbuf);
 }
 
 static GtkWidget *
@@ -213,11 +213,11 @@ footer_item_new (EazelServicesFooter *footer,
 
 	if (has_left_bumper) {
 		left = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (left), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (left), TRUE);
 	}
 	else {
 		left = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (left), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (left), TRUE);
 	}
 	
 	label = eazel_services_label_new_clickable (text,
@@ -232,15 +232,15 @@ footer_item_new (EazelServicesFooter *footer,
 						    FOOTER_TEXT_SIZE,
 						    TRUE);
 	
-	nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (label), TRUE);
+	eel_labeled_image_set_fill (EEL_LABELED_IMAGE (label), TRUE);
 	
 	if (has_right_bumper) {
 		right = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (right), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (right), TRUE);
 	}
 	else {
 		right = eazel_services_image_new_clickable (NULL, NULL, EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-		nautilus_labeled_image_set_fill (NAUTILUS_LABELED_IMAGE (right), TRUE);
+		eel_labeled_image_set_fill (EEL_LABELED_IMAGE (right), TRUE);
 	}
 	
 
@@ -365,7 +365,7 @@ eazel_services_footer_set_date (EazelServicesFooter *footer,
 	g_return_if_fail (date != NULL);
 	g_return_if_fail (date[0] != '\0');
 
-	g_return_if_fail (NAUTILUS_IS_LABEL (footer->details->date));
+	g_return_if_fail (EEL_IS_LABEL (footer->details->date));
 
-	nautilus_label_set_text (NAUTILUS_LABEL (footer->details->date), date);
+	eel_label_set_text (EEL_LABEL (footer->details->date), date);
 }
diff --git a/components/services/nautilus-dependent-shared/eazel-services-header.c b/components/services/nautilus-dependent-shared/eazel-services-header.c
index cca3fcb14..6683296a6 100644
--- a/components/services/nautilus-dependent-shared/eazel-services-header.c
+++ b/components/services/nautilus-dependent-shared/eazel-services-header.c
@@ -27,9 +27,9 @@
 #include "eazel-services-header.h"
 #include "eazel-services-extensions.h"
 
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-image.h>
-#include <libnautilus-extensions/nautilus-label.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-image.h>
+#include <eel/eel-label.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 
 #include <gtk/gtksignal.h>
@@ -46,7 +46,7 @@ static void eazel_services_header_initialize_class (EazelServicesHeaderClass *kl
 static void eazel_services_header_initialize       (EazelServicesHeader      *header);
 static void header_destroy                         (GtkObject                *object);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (EazelServicesHeader, eazel_services_header, GTK_TYPE_HBOX)
+EEL_DEFINE_CLASS_BOILERPLATE (EazelServicesHeader, eazel_services_header, GTK_TYPE_HBOX)
 
 /* EazelServicesHeaderClass methods */
 static void
@@ -79,7 +79,7 @@ header_destroy (GtkObject *object)
 	g_free (header->details);
 	
 	/* Chain destroy */
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* EazelServicesHeader public methods */
@@ -145,8 +145,8 @@ eazel_services_header_middle_new (const char *left_text,
 					  0,
 					  TRUE);
 
-	nautilus_label_set_tile_height (NAUTILUS_LABEL (header->details->left_text),
-					NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
+	eel_label_set_tile_height (EEL_LABEL (header->details->left_text),
+					EEL_SMOOTH_TILE_EXTENT_ONE_STEP);
 
 	gtk_box_pack_start (GTK_BOX (header), header->details->left_text, FALSE, FALSE, 0);
 	gtk_widget_show (header->details->left_text);
@@ -154,8 +154,8 @@ eazel_services_header_middle_new (const char *left_text,
 	fill = eazel_services_image_new (NULL,
 					 EAZEL_SERVICES_HEADER_MIDDLE_FILL_ICON,
 					 EAZEL_SERVICES_BACKGROUND_COLOR_RGB);
-	nautilus_image_set_tile_height (NAUTILUS_IMAGE (fill),
-					NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
+	eel_image_set_tile_height (EEL_IMAGE (fill),
+					EEL_SMOOTH_TILE_EXTENT_ONE_STEP);
 
 	gtk_box_pack_start (GTK_BOX (header), fill, TRUE, TRUE, 0);
 	gtk_widget_show (fill);
@@ -173,8 +173,8 @@ eazel_services_header_middle_new (const char *left_text,
 					  -2,
 					  TRUE);
 
-	nautilus_label_set_tile_height (NAUTILUS_LABEL (header->details->right_text),
-					NAUTILUS_SMOOTH_TILE_EXTENT_ONE_STEP);
+	eel_label_set_tile_height (EEL_LABEL (header->details->right_text),
+					EEL_SMOOTH_TILE_EXTENT_ONE_STEP);
 
 	gtk_box_pack_start (GTK_BOX (header), header->details->right_text, FALSE, FALSE, 0);
 	gtk_widget_show (header->details->right_text);
@@ -188,9 +188,9 @@ eazel_services_header_set_left_text (EazelServicesHeader *header,
 {
 	g_return_if_fail (EAZEL_SERVICES_IS_HEADER (header));
 	g_return_if_fail (text != NULL);
-	g_return_if_fail (NAUTILUS_IS_LABEL (header->details->left_text));
+	g_return_if_fail (EEL_IS_LABEL (header->details->left_text));
 	
-	nautilus_label_set_text (NAUTILUS_LABEL (header->details->left_text), text);
+	eel_label_set_text (EEL_LABEL (header->details->left_text), text);
 }
 
 void
@@ -199,7 +199,7 @@ eazel_services_header_set_right_text (EazelServicesHeader *header,
 {
 	g_return_if_fail (EAZEL_SERVICES_IS_HEADER (header));
 	g_return_if_fail (text != NULL);
-	g_return_if_fail (NAUTILUS_IS_LABEL (header->details->right_text));
+	g_return_if_fail (EEL_IS_LABEL (header->details->right_text));
 	
-	nautilus_label_set_text (NAUTILUS_LABEL (header->details->right_text), text);
+	eel_label_set_text (EEL_LABEL (header->details->right_text), text);
 }
diff --git a/components/services/nautilus-dependent-shared/test-footer-header.c b/components/services/nautilus-dependent-shared/test-footer-header.c
index b9110f588..862b07b4e 100644
--- a/components/services/nautilus-dependent-shared/test-footer-header.c
+++ b/components/services/nautilus-dependent-shared/test-footer-header.c
@@ -63,7 +63,7 @@ main (int argc, char* argv[])
 	gdk_rgb_init ();
 
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-	nautilus_gtk_widget_set_background_color (window, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
+	eel_gtk_widget_set_background_color (window, EAZEL_SERVICES_BACKGROUND_COLOR_SPEC);
 	gtk_signal_connect (GTK_OBJECT (window), "delete_event", GTK_SIGNAL_FUNC (delete_event), NULL);
 	gtk_window_set_title (GTK_WINDOW (window), "Nautilus Wrapped Label Test");
 	gtk_window_set_policy (GTK_WINDOW (window), TRUE, TRUE, FALSE);
@@ -84,7 +84,7 @@ main (int argc, char* argv[])
 
 	eazel_services_footer_update (EAZEL_SERVICES_FOOTER (footer),
 				      footer_items,
-				      NAUTILUS_N_ELEMENTS (footer_items));
+				      EEL_N_ELEMENTS (footer_items));
 	
 	gtk_box_pack_start (GTK_BOX (vbox), header, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), content, TRUE, TRUE, 0);
diff --git a/components/services/summary/Makefile.am b/components/services/summary/Makefile.am
index 15d1567f2..0ef27224f 100644
--- a/components/services/summary/Makefile.am
+++ b/components/services/summary/Makefile.am
@@ -16,6 +16,8 @@ INCLUDES =								\
 	-I$(top_srcdir)/components/services/nautilus-dependent-shared	\
 	-I$(top_srcdir)/components/services/trilobite			\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       			\
 	$(GCONF_CFLAGS) 						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"			\
@@ -52,6 +54,8 @@ nautilus_summary_view_LDADD =									\
 	$(INVENTORY_LIBS)									\
 	$(top_builddir)/libnautilus/libnautilus.la						\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la			\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)										\
 	$(GNOMEUI_LIBS)										\
 	$(GCONF_LIBS)										\
diff --git a/components/services/summary/nautilus-summary-callbacks.c b/components/services/summary/nautilus-summary-callbacks.c
index ac0ac6114..895843415 100644
--- a/components/services/summary/nautilus-summary-callbacks.c
+++ b/components/services/summary/nautilus-summary-callbacks.c
@@ -31,7 +31,7 @@
 #include <liboaf/liboaf.h>
 #include <bonobo/bonobo-main.h>
 
-#include <libnautilus-extensions/nautilus-caption-table.h>
+#include <eel/eel-caption-table.h>
 #include <libtrilobite/eazelproxy.h>
 #include <libtrilobite/libammonite.h>
 #include <libtrilobite/trilobite-redirect.h>
@@ -163,8 +163,8 @@ login_button_cb (GtkWidget      *button, NautilusSummaryView    *view)
 	if (CORBA_OBJECT_NIL != view->details->user_control) {
 		view->details->authn_callback = ammonite_auth_callback_wrapper_new (bonobo_poa(), &cb_funcs, view);
 
-		user_name = nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (view->details->caption_table), 0);
-		password = nautilus_caption_table_get_entry_text (NAUTILUS_CAPTION_TABLE (view->details->caption_table), 1);
+		user_name = eel_caption_table_get_entry_text (EEL_CAPTION_TABLE (view->details->caption_table), 0);
+		password = eel_caption_table_get_entry_text (EEL_CAPTION_TABLE (view->details->caption_table), 1);
 
 		authinfo = EazelProxy_AuthnInfo__alloc ();
 		authinfo->username = CORBA_string_dup (user_name);
diff --git a/components/services/summary/nautilus-summary-dialogs.c b/components/services/summary/nautilus-summary-dialogs.c
index 4d96cd6f7..d751f5c97 100644
--- a/components/services/summary/nautilus-summary-dialogs.c
+++ b/components/services/summary/nautilus-summary-dialogs.c
@@ -23,13 +23,13 @@
 
 #include <config.h>
 
-#include <libnautilus-extensions/nautilus-caption-table.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-background.h>
-#include <libnautilus-extensions/nautilus-string.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
+#include <eel/eel-caption-table.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-background.h>
+#include <eel/eel-string.h>
+#include <eel/eel-gnome-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-image.h>
+#include <eel/eel-image.h>
 
 #include <libgnomeui/gnome-stock.h>
 #include <stdio.h>
@@ -65,7 +65,7 @@ void
 nautilus_summary_show_login_failure_dialog (NautilusSummaryView *view, 
 					    const char *message)
 {
-	nautilus_show_error_dialog (message, 
+	eel_show_error_dialog (message, 
 			            _("Eazel Service Login Error"), 
 				    get_window_from_summary_view (view));
 }
@@ -76,7 +76,7 @@ nautilus_summary_show_error_dialog (NautilusSummaryView *view,
 {
 	GnomeDialog	*dialog;
 
-	dialog = nautilus_show_error_dialog (message, 
+	dialog = eel_show_error_dialog (message, 
 				             _("Service Error"), 
 				             get_window_from_summary_view (view));
 	gtk_signal_connect (GTK_OBJECT (dialog),
@@ -123,17 +123,17 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), GNOME_PAD);
 	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, FALSE, FALSE);
 
-	view->details->caption_table = nautilus_caption_table_new (LOGIN_DIALOG_ROW_COUNT);
+	view->details->caption_table = eel_caption_table_new (LOGIN_DIALOG_ROW_COUNT);
 	gtk_widget_show (view->details->caption_table);
 
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (view->details->caption_table),
+	eel_caption_table_set_row_info (EEL_CAPTION_TABLE (view->details->caption_table),
 					     LOGIN_DIALOG_NAME_ROW,
 					     _("Username:"),
 					     "",
 					     TRUE,
 					     FALSE);
 
-	nautilus_caption_table_set_row_info (NAUTILUS_CAPTION_TABLE (view->details->caption_table),
+	eel_caption_table_set_row_info (EEL_CAPTION_TABLE (view->details->caption_table),
 					     LOGIN_DIALOG_PASSWORD_ROW,
 					     _("Password:"),
 					     "",
@@ -157,7 +157,7 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	}
 
 	image = eazel_services_image_new (image_name, NULL, 0);
-	nautilus_image_set_background_mode (NAUTILUS_IMAGE (image), NAUTILUS_SMOOTH_BACKGROUND_GTK);
+	eel_image_set_background_mode (EEL_IMAGE (image), EEL_SMOOTH_BACKGROUND_GTK);
 
 	hbox = gtk_hbox_new (FALSE, 5);
 	gtk_widget_show (hbox);
@@ -172,7 +172,7 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	message = gtk_label_new (message_text);
 	gtk_label_set_justify (GTK_LABEL (message), GTK_JUSTIFY_LEFT);
 	gtk_label_set_line_wrap (GTK_LABEL (message), TRUE);
-	nautilus_gtk_label_make_bold (GTK_LABEL (message));
+	eel_gtk_label_make_bold (GTK_LABEL (message));
 	gtk_widget_show (message);
 
 	/* right justify the caption table box */
@@ -194,8 +194,8 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 	gnome_dialog_set_default (dialog, LOGIN_DIALOG_OK_BUTTON_INDEX);
 	gtk_signal_connect (GTK_OBJECT (view->details->caption_table), "activate",
 			    name_or_password_field_activated, 
-			    nautilus_gnome_dialog_get_button_by_index (dialog, LOGIN_DIALOG_OK_BUTTON_INDEX));
-	nautilus_caption_table_entry_grab_focus	(NAUTILUS_CAPTION_TABLE (view->details->caption_table), LOGIN_DIALOG_NAME_ROW);
+			    eel_gnome_dialog_get_button_by_index (dialog, LOGIN_DIALOG_OK_BUTTON_INDEX));
+	eel_caption_table_entry_grab_focus	(EEL_CAPTION_TABLE (view->details->caption_table), LOGIN_DIALOG_NAME_ROW);
 
 	if (view->details->attempt_number == 0) {
 		gnome_dialog_button_connect (dialog, LOGIN_DIALOG_REGISTER_BUTTON_INDEX, GTK_SIGNAL_FUNC (register_button_cb), view);
@@ -210,17 +210,17 @@ nautilus_summary_show_login_dialog (NautilusSummaryView *view)
 }
 
 void
-widget_set_nautilus_background_color (GtkWidget *widget, const char *color)
+widget_set_eel_background_color (GtkWidget *widget, const char *color)
 {
-	NautilusBackground      *background;
+	EelBackground      *background;
 
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 	g_return_if_fail (color != NULL);
 
-	background = nautilus_get_widget_background (widget);
+	background = eel_get_widget_background (widget);
 
-	nautilus_background_reset (background);
-	nautilus_background_set_color (background, color);
+	eel_background_reset (background);
+	eel_background_set_color (background, color);
 
 }
 
@@ -290,12 +290,12 @@ set_dialog_parent (NautilusSummaryView *view, GnomeDialog *dialog)
 static void
 name_or_password_field_activated (GtkWidget *caption_table, int active_entry, gpointer user_data)
 {
-	g_assert (NAUTILUS_IS_CAPTION_TABLE (caption_table));
+	g_assert (EEL_IS_CAPTION_TABLE (caption_table));
 	g_assert (GTK_IS_BUTTON (user_data));
 
 	/* auto-click "OK" button when password activated (via Enter key) */
 	if (active_entry == LOGIN_DIALOG_OK_BUTTON_INDEX) {
-		nautilus_gtk_button_auto_click (GTK_BUTTON (user_data));
+		eel_gtk_button_auto_click (GTK_BUTTON (user_data));
 	}
 }
 
diff --git a/components/services/summary/nautilus-summary-dialogs.h b/components/services/summary/nautilus-summary-dialogs.h
index 44dfa48c2..7987c289d 100644
--- a/components/services/summary/nautilus-summary-dialogs.h
+++ b/components/services/summary/nautilus-summary-dialogs.h
@@ -29,7 +29,7 @@ void	nautilus_summary_show_login_failure_dialog (NautilusSummaryView *view,
 void	nautilus_summary_show_error_dialog         (NautilusSummaryView	*view,
 						    const char		*message);
 void	nautilus_summary_show_login_dialog         (NautilusSummaryView	*view);
-void	widget_set_nautilus_background_color	   (GtkWidget		*widget,
+void	widget_set_eel_background_color	   (GtkWidget		*widget,
 						    const char		*color);
 
 #endif /* NAUTILUS_SUMMARY_DIALOGS_H */
diff --git a/components/services/summary/nautilus-summary-footer.c b/components/services/summary/nautilus-summary-footer.c
index 98bfc1ca5..efd11b9f5 100644
--- a/components/services/summary/nautilus-summary-footer.c
+++ b/components/services/summary/nautilus-summary-footer.c
@@ -26,19 +26,19 @@
 #include <bonobo/bonobo-control.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-caption-table.h>
+#include <eel/eel-caption-table.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-tabs.h>
 
 #include <libgnomeui/gnome-stock.h>
diff --git a/components/services/summary/nautilus-summary-menu-items.c b/components/services/summary/nautilus-summary-menu-items.c
index 3137e59a9..53436497b 100644
--- a/components/services/summary/nautilus-summary-menu-items.c
+++ b/components/services/summary/nautilus-summary-menu-items.c
@@ -27,19 +27,19 @@
 #include <bonobo/bonobo-control.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-caption-table.h>
+#include <eel/eel-caption-table.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-tabs.h>
 
 #include <libgnomeui/gnome-stock.h>
diff --git a/components/services/summary/nautilus-summary-view-private.h b/components/services/summary/nautilus-summary-view-private.h
index 7e42014bd..f1ca7dfa4 100644
--- a/components/services/summary/nautilus-summary-view-private.h
+++ b/components/services/summary/nautilus-summary-view-private.h
@@ -30,8 +30,8 @@
 #include <gnome.h>
 
 #define DEFAULT_SUMMARY_BACKGROUND_COLOR_SPEC	"rgb:FFFF/FFFF/FFFF"
-#define DEFAULT_SUMMARY_BACKGROUND_COLOR_RGB	NAUTILUS_RGB_COLOR_WHITE
-#define DEFAULT_SUMMARY_TEXT_COLOR_RGB		NAUTILUS_RGB_COLOR_BLACK
+#define DEFAULT_SUMMARY_BACKGROUND_COLOR_RGB	EEL_RGB_COLOR_WHITE
+#define DEFAULT_SUMMARY_TEXT_COLOR_RGB		EEL_RGB_COLOR_BLACK
 
 #define URL_REDIRECT_TABLE_HOME			"eazel-services://anonymous/services/urls"
 #define URL_REDIRECT_TABLE_HOME_2		"eazel-services:/services/urls"
diff --git a/components/services/summary/nautilus-summary-view.c b/components/services/summary/nautilus-summary-view.c
index 0041f0989..706d77c79 100644
--- a/components/services/summary/nautilus-summary-view.c
+++ b/components/services/summary/nautilus-summary-view.c
@@ -42,21 +42,21 @@
 #include "../inventory/eazel-inventory.h"
 #endif
 
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
-#include <libnautilus-extensions/nautilus-clickable-image.h>
+#include <eel/eel-clickable-image.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gnome-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-label.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gnome-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-label.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-tabs.h>
-#include <libnautilus-extensions/nautilus-viewport.h>
+#include <eel/eel-viewport.h>
 
 #include <liboaf/liboaf.h>
 #include <libtrilobite/trilobite-redirect.h>
@@ -111,7 +111,7 @@ static void     summary_view_button_callback           (GtkWidget
 static void     cancel_load_in_progress                (NautilusSummaryView *view);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusSummaryView, nautilus_summary_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusSummaryView, nautilus_summary_view, GTK_TYPE_EVENT_BOX)
 
 
 static const char goto_button_label[] = N_("Go There");
@@ -190,10 +190,10 @@ update_footer (NautilusSummaryView *view)
 	int size;
 
 	if (view->details->logged_in) {	
-		size = NAUTILUS_N_ELEMENTS (footer_online_items);
+		size = EEL_N_ELEMENTS (footer_online_items);
 		localized_items = localize_items (footer_online_items, size);
 	} else {
-		size = NAUTILUS_N_ELEMENTS (footer_offline_items);
+		size = EEL_N_ELEMENTS (footer_offline_items);
 		localized_items = localize_items (footer_offline_items, size);
 	}
 	
@@ -229,9 +229,9 @@ summary_view_button_callback (GtkWidget                  *button,
 {
 	const char *command;
 
-	if (nautilus_istr_has_prefix (cbdata->uri, NAUTILUS_COMMAND_SPECIFIER)) {
+	if (eel_istr_has_prefix (cbdata->uri, NAUTILUS_COMMAND_SPECIFIER)) {
 		command = cbdata->uri + strlen (NAUTILUS_COMMAND_SPECIFIER);
-		nautilus_gnome_shell_execute (command);
+		eel_gnome_shell_execute (command);
 	} else {
 		nautilus_view_open_location_in_this_window (cbdata->view, cbdata->uri);
 	}
@@ -286,7 +286,7 @@ summary_view_link_image_new (NautilusSummaryView *view,
 							     NULL,
 							     DEFAULT_SUMMARY_BACKGROUND_COLOR_RGB,
 							     MAX_IMAGE_WIDTH, MAX_IMAGE_HEIGHT);
-	nautilus_clickable_image_set_prelight (NAUTILUS_CLICKABLE_IMAGE (image), TRUE);
+	eel_clickable_image_set_prelight (EEL_CLICKABLE_IMAGE (image), TRUE);
 
 	goto_uri_on_clicked (image, view->details->nautilus_view, click_uri);
 	
@@ -308,10 +308,10 @@ summary_view_item_label_new (char *label_text,
 					  NULL,
 					  relative_font_size,
 					  bold);
-	nautilus_label_set_wrap (NAUTILUS_LABEL (label), TRUE);
-	nautilus_label_set_justify (NAUTILUS_LABEL (label), GTK_JUSTIFY_LEFT);
+	eel_label_set_wrap (EEL_LABEL (label), TRUE);
+	eel_label_set_justify (EEL_LABEL (label), GTK_JUSTIFY_LEFT);
 	gtk_misc_set_alignment (GTK_MISC (label), 0, 0);
-	nautilus_label_set_adjust_wrap_on_resize (NAUTILUS_LABEL (label), TRUE);
+	eel_label_set_adjust_wrap_on_resize (EEL_LABEL (label), TRUE);
 
 	return label;
 }
@@ -453,9 +453,9 @@ summary_view_create_pane (NautilusSummaryView *view,
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (pane),
 			                GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	
-	viewport = nautilus_viewport_new (NULL, NULL);
-	nautilus_viewport_set_constrain_width (NAUTILUS_VIEWPORT (viewport), TRUE);
-	widget_set_nautilus_background_color (viewport, DEFAULT_SUMMARY_BACKGROUND_COLOR_SPEC);
+	viewport = eel_viewport_new (NULL, NULL);
+	eel_viewport_set_constrain_width (EEL_VIEWPORT (viewport), TRUE);
+	widget_set_eel_background_color (viewport, DEFAULT_SUMMARY_BACKGROUND_COLOR_SPEC);
 
 	gtk_viewport_set_shadow_type (GTK_VIEWPORT (viewport), GTK_SHADOW_NONE);
 	gtk_widget_show (viewport);
@@ -493,7 +493,7 @@ create_news_pane (NautilusSummaryView *view)
 static gboolean
 program_uri_for_nonexistent_program (const char *uri)
 {
-	return nautilus_istr_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER) &&
+	return eel_istr_has_prefix (uri, NAUTILUS_COMMAND_SPECIFIER) &&
 		!gnome_is_program_in_path (uri + strlen (NAUTILUS_COMMAND_SPECIFIER));
 }
 
@@ -855,7 +855,7 @@ nautilus_summary_view_destroy (GtkObject *object)
 
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 	CORBA_exception_free (&ev);
 
diff --git a/components/services/time/nautilus-view/main.c b/components/services/time/nautilus-view/main.c
index 0e763cab1..f473da57a 100644
--- a/components/services/time/nautilus-view/main.c
+++ b/components/services/time/nautilus-view/main.c
@@ -30,7 +30,7 @@
 
 #include <gnome.h>
 #include <liboaf/liboaf.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <bonobo.h>
 
 static int object_count = 0;
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
            Unfortunately, this has to be done explicitly for each domain.
         */
         if (getenv("NAUTILUS_DEBUG") != NULL)
-        	nautilus_make_warnings_and_criticals_stop_in_debugger
+        	eel_make_warnings_and_criticals_stop_in_debugger
         		(G_LOG_DOMAIN, g_log_domain_glib, "Gdk", "Gtk", "GnomeVFS", NULL);
 
 
diff --git a/components/services/time/nautilus-view/trilobite-eazel-time-view.c b/components/services/time/nautilus-view/trilobite-eazel-time-view.c
index 8b0bc1ba6..be2e11fcd 100644
--- a/components/services/time/nautilus-view/trilobite-eazel-time-view.c
+++ b/components/services/time/nautilus-view/trilobite-eazel-time-view.c
@@ -38,8 +38,8 @@
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-stock.h>
 #include <libnautilus/nautilus-bonobo-ui.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-password-dialog.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-password-dialog.h>
 
 #include <libtrilobite/libtrilobite.h>
 
@@ -81,7 +81,7 @@ static void load_location_callback                     (NautilusView
 							TrilobiteEazelTimeView      *view);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (TrilobiteEazelTimeView, trilobite_eazel_time_view, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (TrilobiteEazelTimeView, trilobite_eazel_time_view, GTK_TYPE_EVENT_BOX)
    
 static void
 set_status_text (TrilobiteEazelTimeView *view, const char *status_str)
@@ -250,15 +250,15 @@ trilobite_eazel_time_view_get_password (GtkObject *object, const char *prompt, v
 		message = "Incorrect password.";
 	}
 
-	dialog = nautilus_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
-	okay = nautilus_password_dialog_run_and_block (NAUTILUS_PASSWORD_DIALOG (dialog));
+	dialog = eel_password_dialog_new ("Authenticate Me", message, prompt, "", TRUE);
+	okay = eel_password_dialog_run_and_block (EEL_PASSWORD_DIALOG (dialog));
 
 	if (! okay) {
 		view->details->password_attempts = 0;
 		tmp = g_strdup ("");
 	} else {
-		tmp =  nautilus_password_dialog_get_password (NAUTILUS_PASSWORD_DIALOG (dialog));
-		if (nautilus_password_dialog_get_remember (NAUTILUS_PASSWORD_DIALOG (dialog))) {
+		tmp =  eel_password_dialog_get_password (EEL_PASSWORD_DIALOG (dialog));
+		if (eel_password_dialog_get_remember (EEL_PASSWORD_DIALOG (dialog))) {
 			view->details->remembered_password = g_strdup (tmp);
 		}
 	}
@@ -438,7 +438,7 @@ trilobite_eazel_time_view_destroy (GtkObject *object)
 
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 
 	CORBA_exception_free (&ev);
 
diff --git a/components/services/trilobite/sample/nautilus-view/Makefile.am b/components/services/trilobite/sample/nautilus-view/Makefile.am
index f121df1bd..421650d57 100644
--- a/components/services/trilobite/sample/nautilus-view/Makefile.am
+++ b/components/services/trilobite/sample/nautilus-view/Makefile.am
@@ -9,6 +9,8 @@ INCLUDES =								\
 	-I$(top_srcdir)/components/services/trilobite/libtrilobite	\
 	-I$(top_srcdir)/components/services/trilobite/sample/lib	\
 	-I$(top_builddir)						\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       			\
 	$(GCONF_CFLAGS) 						\
 	$(NULL)
@@ -27,6 +29,8 @@ nautilus_sample_service_view_LDADD =				\
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS)					\
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index 1cca0503e..f4cc53f8b 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -10,6 +10,8 @@ INCLUDES =					\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/libnautilus		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       \
 	$(GCONF_CFLAGS) 			\
 	$(OAF_CFLAGS)				\
@@ -27,6 +29,8 @@ nautilus_text_view_SOURCES =		        \
 nautilus_text_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) 					\
diff --git a/components/text/nautilus-text-view.c b/components/text/nautilus-text-view.c
index b00b6a2c7..df9024c6a 100644
--- a/components/text/nautilus-text-view.c
+++ b/components/text/nautilus-text-view.c
@@ -34,19 +34,19 @@
 
 #include <libnautilus/libnautilus.h>
 #include <libnautilus/nautilus-clipboard.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-bonobo-extensions.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-gdk-extensions.h>
-#include <libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-gdk-extensions.h>
+#include <eel/eel-gdk-pixbuf-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-string.h>
 #include <libnautilus-extensions/nautilus-font-factory.h>
-#include <libnautilus-extensions/nautilus-stock-dialogs.h>
-#include <libnautilus-extensions/nautilus-xml-extensions.h>
+#include <eel/eel-stock-dialogs.h>
+#include <eel/eel-xml-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 
 #include <gnome.h>
@@ -118,7 +118,7 @@ static void nautilus_text_view_load_uri         (NautilusTextView      *view,
 						 const char            *uri);
 static void font_changed_callback               (gpointer               callback_data);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTextView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTextView,
                                    nautilus_text_view,
                                    NAUTILUS_TYPE_VIEW)
 
@@ -174,7 +174,7 @@ nautilus_text_view_initialize (NautilusTextView *text_view)
 	bonobo_zoomable_set_parameters_full (text_view->details->zoomable,
 					     1.0, .25, 4.0, TRUE, TRUE, FALSE,
 					     text_view_preferred_zoom_levels, NULL,
-					     NAUTILUS_N_ELEMENTS (text_view_preferred_zoom_levels));
+					     EEL_N_ELEMENTS (text_view_preferred_zoom_levels));
 	
 	bonobo_object_add_interface (BONOBO_OBJECT (text_view),
 				     BONOBO_OBJECT (text_view->details->zoomable));
@@ -261,7 +261,7 @@ nautilus_text_view_destroy (GtkObject *object)
 
 	g_free (text_view->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 /* here's a callback for the async close, which does nothing */
@@ -334,7 +334,7 @@ file_read_callback (GnomeVFSAsyncHandle *vfs_handle,
                         message = g_strdup_printf (_("Sorry, but %s is too large for Nautilus to load all of it."),
                                                    name);
                         
-			nautilus_show_error_dialog (message, _("File too large"), NULL);
+			eel_show_error_dialog (message, _("File too large"), NULL);
                         
 			g_free (name);
 			g_free (message);
@@ -443,7 +443,7 @@ nautilus_text_view_update_font (NautilusTextView *text_view)
 
 	g_return_if_fail (font != NULL);
 	
-	nautilus_gtk_widget_set_font (text_view->details->text_display, font);
+	eel_gtk_widget_set_font (text_view->details->text_display, font);
 	gdk_font_unref (font);
 
 	gtk_editable_changed (GTK_EDITABLE (text_view->details->text_display));
@@ -458,7 +458,7 @@ handle_ui_event (BonoboUIComponent *ui,
 		 NautilusTextView *view)
 {
 	if (type == Bonobo_UIComponent_STATE_CHANGED
-            && nautilus_str_is_equal (state, "1")) {
+            && eel_str_is_equal (state, "1")) {
                 nautilus_preferences_set (NAUTILUS_PREFERENCES_TEXT_VIEW_FONT, id);
 	}
 }
@@ -485,7 +485,7 @@ handle_service_menu_item (BonoboUIComponent *ui, gpointer user_data, const char
 	parameters = (ServiceMenuItemParameters *) user_data;
 	
 	/* determine if we should operate on the whole document or just the selection */
-	if (nautilus_strcmp (parameters->source_mode, "document") == 0) {
+	if (eel_strcmp (parameters->source_mode, "document") == 0) {
 		selected_text = gtk_editable_get_chars (GTK_EDITABLE (parameters->text_view->details->text_display), 0, -1);
 		if (selected_text && strlen (selected_text) > 0) {
 			/* formulate the url */
@@ -576,18 +576,18 @@ add_one_service (NautilusTextView *text_view, BonoboControl *control, const char
 		service_node = xmlDocGetRootElement (service_definition);
 	
 		/* extract the label and template */
-		label = nautilus_xml_get_property_translated (service_node, "label");	
-		tooltip = nautilus_xml_get_property_translated (service_node, "tooltip");	
+		label = eel_xml_get_property_translated (service_node, "label");	
+		tooltip = eel_xml_get_property_translated (service_node, "tooltip");	
 		template = xmlGetProp (service_node, "template");
 		source_mode = xmlGetProp (service_node, "source");
 		
 		if (label != NULL && template != NULL) {
 			/* allocate a structure containing the text_view and template to pass in as the user data */
-			escaped_label = nautilus_str_double_underscores (label);
+			escaped_label = eel_str_double_underscores (label);
 			parameters = service_menu_item_parameters_new (text_view, template, source_mode);
 		
 			text_view->details->service_item_uses_selection[*index] = 
-				nautilus_strcmp (source_mode, "document") != 0;
+				eel_strcmp (source_mode, "document") != 0;
 			
 			/* use bonobo to add the menu item */
 			nautilus_bonobo_add_numbered_menu_item 
@@ -615,7 +615,7 @@ add_one_service (NautilusTextView *text_view, BonoboControl *control, const char
 			
 			/* initially disable the item unless it's document-based; it will be enabled if there's a selection */
 			verb_path = g_strdup_printf ("/commands/%s", verb_name);
-			if (nautilus_strcmp (source_mode, "document") != 0) {
+			if (eel_strcmp (source_mode, "document") != 0) {
 				nautilus_bonobo_set_sensitive (ui, verb_path, FALSE);
 			}
 			g_free (verb_name);	
@@ -664,7 +664,7 @@ add_services_to_menu (NautilusTextView *text_view,
 			break;
 		}
 		
-		if (nautilus_istr_has_suffix (current_file_info->name, ".xml")) {		
+		if (eel_istr_has_suffix (current_file_info->name, ".xml")) {		
 			if (g_list_find_custom (added_services, current_file_info->name,
 						(GCompareFunc) strcmp) == NULL) {
 				service_xml_path = nautilus_make_path (services_directory, current_file_info->name);
@@ -712,7 +712,7 @@ nautilus_text_view_build_service_menu (NautilusTextView *text_view, BonoboContro
 	g_free (user_directory);
 	
 	text_view->details->service_item_count = index;	
-	nautilus_g_list_free_deep (added_services);
+	eel_g_list_free_deep (added_services);
 }
 
 /* handle updating the service menu items according to the selection state of the text display */
diff --git a/components/throbber/Makefile.am b/components/throbber/Makefile.am
index 2da02b698..70587395c 100644
--- a/components/throbber/Makefile.am
+++ b/components/throbber/Makefile.am
@@ -10,6 +10,8 @@ INCLUDES =					\
 	-I$(top_builddir)			\
 	-I$(top_builddir)/libnautilus		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(GNOMEUI_CFLAGS)                       \
 	$(GCONF_CFLAGS) 			\
 	$(OAF_CFLAGS)				\
@@ -27,6 +29,8 @@ nautilus_throbber_SOURCES =		        \
 nautilus_throbber_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la \
+	$(EEL_LIBS) \
+	$(LIBRSVG_LIBS) \
 	$(BONOBO_LIBS)					\
 	$(GNOMEUI_LIBS)					\
 	$(GCONF_LIBS) 					\
diff --git a/components/throbber/main.c b/components/throbber/main.c
index 6ed4b37b4..fba42d93f 100644
--- a/components/throbber/main.c
+++ b/components/throbber/main.c
@@ -28,7 +28,7 @@
 #include <bonobo.h>
 #include <gnome.h>
 #include <libgnomevfs/gnome-vfs.h>
-#include <libnautilus-extensions/nautilus-debug.h>
+#include <eel/eel-debug.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
 #include <liboaf/liboaf.h>
 
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
 	 * explicitly for each domain.
 	 */
 	if (g_getenv ("NAUTILUS_DEBUG") != NULL) {
-		nautilus_make_warnings_and_criticals_stop_in_debugger
+		eel_make_warnings_and_criticals_stop_in_debugger
 			(G_LOG_DOMAIN, g_log_domain_glib,
 			 "Bonobo",
 			 "Gdk",
diff --git a/components/throbber/nautilus-throbber.c b/components/throbber/nautilus-throbber.c
index abf494526..f86d7513e 100644
--- a/components/throbber/nautilus-throbber.c
+++ b/components/throbber/nautilus-throbber.c
@@ -36,10 +36,10 @@
 #include <libgnome/gnome-util.h>
 #include <libgnomeui/gnome-pixmap.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
 #include <libnautilus-extensions/nautilus-theme.h>
 #include <libnautilus/nautilus-bonobo-workarounds.h>
@@ -82,7 +82,7 @@ static void	nautilus_throbber_size_allocate		 (GtkWidget *widget, GtkAllocation
 static void	nautilus_throbber_size_request		 (GtkWidget *widget, GtkRequisition *requisition);
 static void     nautilus_throbber_remove_update_callback (NautilusThrobber *throbber);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusThrobber, nautilus_throbber, GTK_TYPE_EVENT_BOX)
 
 static void
 nautilus_throbber_initialize_class (NautilusThrobberClass *throbber_class)
@@ -201,7 +201,7 @@ nautilus_throbber_destroy (GtkObject *object)
 	
 	g_free (throbber->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 BonoboObject*
@@ -430,7 +430,7 @@ nautilus_throbber_map (GtkWidget *widget)
 	
 	throbber = NAUTILUS_THROBBER (widget);
 	
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, map, (widget));
 	throbber->details->ready = TRUE;
 }
 
@@ -638,7 +638,7 @@ nautilus_throbber_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	int throbber_width, throbber_height;
 	NautilusThrobber *throbber = NAUTILUS_THROBBER (widget);
 
-	NAUTILUS_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
+	EEL_CALL_PARENT (GTK_WIDGET_CLASS, size_allocate, (widget, allocation));
 
 	get_throbber_dimensions (throbber, &throbber_width, &throbber_height);
 	
diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am
index ead973cf7..f8d4712e7 100644
--- a/components/tree/Makefile.am
+++ b/components/tree/Makefile.am
@@ -6,6 +6,8 @@ INCLUDES =						\
 	-DG_LOG_DOMAIN=\"Nautilus-Tree\"		\
 	-I$(top_srcdir)					\
 	-I$(top_builddir)				\
+	$(EEL_INCLUDEDIR) \
+	$(LIBRSVG_INCLUDEDIR) \
 	$(VFS_CFLAGS)					\
 	$(GCONF_CFLAGS)					\
 	$(GNOMEUI_CFLAGS)				\
diff --git a/components/tree/nautilus-tree-change-queue.c b/components/tree/nautilus-tree-change-queue.c
index ba0e810ec..9c7cc7d93 100644
--- a/components/tree/nautilus-tree-change-queue.c
+++ b/components/tree/nautilus-tree-change-queue.c
@@ -25,8 +25,8 @@
    them to an idle handler. */
 
 #include "nautilus-tree-change-queue.h"
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
 
 struct NautilusTreeChangeQueueDetails {
 	GSList *head;
@@ -39,7 +39,7 @@ static void nautilus_tree_change_queue_initialize       (gpointer     object,
 							 gpointer     klass);
 static void nautilus_tree_change_queue_initialize_class (gpointer     klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeChangeQueue, nautilus_tree_change_queue, GTK_TYPE_OBJECT)
 
 
 static NautilusTreeChange *nautilus_tree_change_new     (NautilusTreeChangeType  change_type,
@@ -76,12 +76,12 @@ nautilus_tree_change_queue_destroy (GtkObject *object)
 	NautilusTreeChangeQueue *queue;
 	
 	queue = (NautilusTreeChangeQueue *) object;
-        nautilus_g_slist_free_deep_custom (queue->details->head,
+        eel_g_slist_free_deep_custom (queue->details->head,
 					   (GFunc) nautilus_tree_change_free,
 					   NULL);
 	g_free (queue->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/tree/nautilus-tree-expansion-state.c b/components/tree/nautilus-tree-expansion-state.c
index 065d45bf1..80e3097af 100644
--- a/components/tree/nautilus-tree-expansion-state.c
+++ b/components/tree/nautilus-tree-expansion-state.c
@@ -26,8 +26,8 @@
 #include <config.h>
 #include "nautilus-tree-expansion-state.h"
 
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-preferences.h>
 
 
@@ -44,7 +44,7 @@ static void               nautilus_tree_expansion_state_initialize       (gpoint
 									  gpointer     klass);
 static void               nautilus_tree_expansion_state_initialize_class (gpointer     klass);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeExpansionState, nautilus_tree_expansion_state, GTK_TYPE_OBJECT)
 
 
 static gboolean	          expansion_table_hash_remove_func               (gpointer key,
@@ -87,7 +87,7 @@ nautilus_tree_expansion_state_load_table_from_gconf (NautilusTreeExpansionState
 
 	uris = nautilus_preferences_get_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE);
 	g_list_foreach (uris, expansion_state_load_callback, expansion_state);
-	nautilus_g_list_free_deep (uris);
+	eel_g_list_free_deep (uris);
 }
 
 
@@ -120,7 +120,7 @@ nautilus_tree_expansion_state_save_table_to_gconf (NautilusTreeExpansionState *e
 	GList *uris;
 
 	uris = hash_table_get_keys (expansion_state->details->table);
-	uris = nautilus_g_str_list_alphabetize (uris);
+	uris = eel_g_str_list_alphabetize (uris);
 	nautilus_preferences_set_string_list (NAUTILUS_PREFERENCES_TREE_VIEW_EXPANSION_STATE, uris);
 	g_list_free (uris);
 }
@@ -160,7 +160,7 @@ nautilus_tree_expansion_state_destroy (GtkObject *object)
 
 	g_free (expansion_state->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/tree/nautilus-tree-model.c b/components/tree/nautilus-tree-model.c
index f4c2da35d..685a89a5a 100644
--- a/components/tree/nautilus-tree-model.c
+++ b/components/tree/nautilus-tree-model.c
@@ -30,8 +30,8 @@
 #include <gtk/gtksignal.h>
 #include <libgnomevfs/gnome-vfs.h>
 #include <libnautilus-extensions/nautilus-file-attributes.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -92,7 +92,7 @@ static void nautilus_tree_model_directory_done_loading_callback  (NautilusDirect
 								  NautilusTreeModel *model);
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeModel, nautilus_tree_model, GTK_TYPE_OBJECT)
 
 /* infrastructure stuff */
 
@@ -159,7 +159,7 @@ destroy_file_hash (GHashTable *hash)
 	if (hash == NULL) {
 		return;
 	}
-	nautilus_g_hash_table_destroy_deep_custom
+	eel_g_hash_table_destroy_deep_custom
 		(hash,
 		 (GFunc) nautilus_file_unref, NULL,
 		 NULL, NULL);
@@ -189,7 +189,7 @@ nautilus_tree_model_destroy (GtkObject *object)
 
 	g_free (model->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 
diff --git a/components/tree/nautilus-tree-node.c b/components/tree/nautilus-tree-node.c
index 80e87bbed..74ac66123 100644
--- a/components/tree/nautilus-tree-node.c
+++ b/components/tree/nautilus-tree-node.c
@@ -29,7 +29,7 @@
 #include "nautilus-tree-node-private.h"
 #include <libnautilus-extensions/nautilus-directory.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-macros.h>
 
 
 static void               nautilus_tree_node_destroy          (GtkObject   *object);
@@ -39,7 +39,7 @@ static void               nautilus_tree_node_initialize_class (gpointer     klas
 
 
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeNode, nautilus_tree_node, GTK_TYPE_OBJECT)
 
 
 static void
@@ -80,7 +80,7 @@ nautilus_tree_node_destroy (GtkObject *object)
 	g_free (node->details->uri);
 	g_free (node->details);
 
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 NautilusTreeNode *
diff --git a/components/tree/nautilus-tree-view-dnd.c b/components/tree/nautilus-tree-view-dnd.c
index d22622ff1..e38968cc0 100644
--- a/components/tree/nautilus-tree-view-dnd.c
+++ b/components/tree/nautilus-tree-view-dnd.c
@@ -33,12 +33,12 @@
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
-#include <libnautilus-extensions/nautilus-background.h>
+#include <eel/eel-background.h>
 #include <libnautilus-extensions/nautilus-drag.h>
 #include <libnautilus-extensions/nautilus-file-operations.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
+#include <eel/eel-glib-extensions.h>
+#include <eel/eel-gtk-extensions.h>
 
 /* This constant is zero because right now it does not seem we need
    extra delay on horizontal-only auto-scroll. However, it's left in
@@ -168,7 +168,7 @@ tree_view_realize_callback (GtkWidget *widget, gpointer user_data)
         gtk_style_ref (new_style);
 
 	/* calculate a new prelighting color */
-	nautilus_gtk_style_shade (&style->bg[GTK_STATE_SELECTED], 
+	eel_gtk_style_shade (&style->bg[GTK_STATE_SELECTED], 
 				  &new_prelight_color, 
 				  1.35);
 	/* set the new color to our special prelighting Style. */
@@ -197,14 +197,14 @@ nautilus_tree_view_init_dnd (NautilusTreeView *view)
 	view->details->dnd->drag_info = g_new0 (NautilusDragInfo, 1);
 	nautilus_drag_init (view->details->dnd->drag_info,
 			    nautilus_tree_view_dnd_target_table,
-			    NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+			    EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
 			    NULL);
 
 
 	gtk_drag_dest_set (GTK_WIDGET (view->details->tree), 
 			   0,
 			   nautilus_tree_view_dnd_target_table,
-			   NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
+			   EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table),
 			   GDK_ACTION_COPY 
 			   | GDK_ACTION_MOVE 
 			   | GDK_ACTION_LINK 
@@ -396,7 +396,7 @@ get_data_on_first_target_we_support (GtkWidget *widget, GdkDragContext *context,
 
 	if (nautilus_tree_view_dnd_target_list == NULL)
 		nautilus_tree_view_dnd_target_list = gtk_target_list_new (nautilus_tree_view_dnd_target_table,
-									  NAUTILUS_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
+									  EEL_N_ELEMENTS (nautilus_tree_view_dnd_target_table));
 
 	for (target = context->targets; target != NULL; target = target->next) {
 		guint dummy_info;
@@ -801,7 +801,7 @@ nautilus_tree_view_set_dnd_icon (NautilusTreeView *tree_view, GdkDragContext *co
 				      &expanded);
 
 	/* FIXME: We can do better than 10,10 for the hot spot. */
-	nautilus_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
+	eel_drag_set_icon_pixbuf (context, pixbuf, 10, 10);
 }
 
 
@@ -1031,8 +1031,8 @@ static gboolean
 ready_to_start_scrolling (NautilusDragInfo *drag_info,
 			  int y_scroll_delta)
 {
-	return (y_scroll_delta != 0 && drag_info->start_auto_scroll_in < nautilus_get_system_time ()) ||
-		drag_info->start_auto_scroll_in +  AUTOSCROLL_X_ONLY_EXTRA_DELAY < nautilus_get_system_time ();
+	return (y_scroll_delta != 0 && drag_info->start_auto_scroll_in < eel_get_system_time ()) ||
+		drag_info->start_auto_scroll_in +  AUTOSCROLL_X_ONLY_EXTRA_DELAY < eel_get_system_time ();
 }
 
 static int
@@ -1091,8 +1091,8 @@ nautilus_tree_view_real_scroll (NautilusTreeView *tree_view, float delta_x, floa
 	hadj = gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (tree_view->details->scrolled_window));
 	vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (tree_view->details->scrolled_window));
 
-	nautilus_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
-	nautilus_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
+	eel_gtk_adjustment_set_value (hadj, hadj->value + delta_x);
+	eel_gtk_adjustment_set_value (vadj, vadj->value + delta_y);
 }
 
 
@@ -1268,7 +1268,7 @@ nautilus_tree_view_drag_destroy_real (NautilusTreeView *tree_view)
 	drag_info->drop_occured = FALSE;
 
 	if (drag_info->selection_data != NULL) {
-		nautilus_gtk_selection_data_free_deep (drag_info->selection_data);
+		eel_gtk_selection_data_free_deep (drag_info->selection_data);
 		drag_info->selection_data = NULL;
 	}
 }
diff --git a/components/tree/nautilus-tree-view.c b/components/tree/nautilus-tree-view.c
index ffc47a3bb..94ffaf294 100644
--- a/components/tree/nautilus-tree-view.c
+++ b/components/tree/nautilus-tree-view.c
@@ -39,12 +39,12 @@
 #include <libnautilus-extensions/nautilus-file-attributes.h>
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-file.h>
-#include <libnautilus-extensions/nautilus-glib-extensions.h>
+#include <eel/eel-glib-extensions.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
-#include <libnautilus-extensions/nautilus-gtk-extensions.h>
-#include <libnautilus-extensions/nautilus-gtk-macros.h>
+#include <eel/eel-gtk-extensions.h>
+#include <eel/eel-gtk-macros.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
-#include <libnautilus-extensions/nautilus-string.h>
+#include <eel/eel-string.h>
 #include <stdio.h>
 
 #define DISPLAY_TIMEOUT_INTERVAL_MSECS 500
@@ -93,7 +93,7 @@ static void     insert_unparented_nodes              (NautilusTreeView      *vie
 static void     expand_uri_sequence_and_select_end   (NautilusTreeView      *view);
 static gboolean is_anti_aliased			     (NautilusTreeView	    *view);
 
-NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusTreeView,
+EEL_DEFINE_CLASS_BOILERPLATE (NautilusTreeView,
 				   nautilus_tree_view,
 				   NAUTILUS_TYPE_VIEW)
 
@@ -161,7 +161,7 @@ nautilus_tree_view_would_include_uri (NautilusTreeView *view,
 
 	/* The tree view currently only ever shows `file:' URIs */
 
-	if (!nautilus_str_has_prefix (uri, "file:")) {
+	if (!eel_str_has_prefix (uri, "file:")) {
 		return FALSE;
 	}
 
@@ -573,7 +573,7 @@ notify_node_seen (NautilusTreeView *view,
 
 	uri = nautilus_file_get_uri (nautilus_tree_node_get_file (node));
 	
-	if (nautilus_strcmp (uri, view->details->wait_uri) == 0) {
+	if (eel_strcmp (uri, view->details->wait_uri) == 0) {
 		awaited_node_or_uri_found (view);
 	}
 	
@@ -1149,14 +1149,14 @@ nautilus_tree_view_destroy (GtkObject *object)
 		gtk_object_unref (GTK_OBJECT (view->details->expansion_state));
 	}
 
-	nautilus_gtk_object_list_free (view->details->unparented_tree_nodes);
+	eel_gtk_object_list_free (view->details->unparented_tree_nodes);
 	
 	g_free (view->details->current_main_view_uri);
 	g_free (view->details->selected_uri);
 
 	g_free (view->details);
 	
-	NAUTILUS_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
+	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
 }
 
 static NautilusCTreeNode *
@@ -1259,7 +1259,7 @@ call_when_uri_loaded_or_parent_done_loading (NautilusTreeView *view,
 static void
 cancel_selection_in_progress (NautilusTreeView *view)
 {
-	nautilus_g_list_free_deep (view->details->in_progress_select_uris);
+	eel_g_list_free_deep (view->details->in_progress_select_uris);
 	view->details->in_progress_select_uris = NULL;
 
 	g_free (view->details->wait_uri);
@@ -1348,7 +1348,7 @@ expand_uri_sequence_and_select_end (NautilusTreeView *view)
 	
 	p->prev->next = NULL;
 	p->prev = NULL;
-	nautilus_g_list_free_deep (old_sequence);
+	eel_g_list_free_deep (old_sequence);
 }
 
 static void
@@ -1360,7 +1360,7 @@ select_current_location (NautilusTreeView *view)
 	 * nautilus_uris_match or nautilus_uris_match_ignore_fragments
 	 * should be used here.
 	 */
-	if (nautilus_strcmp (view->details->current_main_view_uri,
+	if (eel_strcmp (view->details->current_main_view_uri,
 			     view->details->selected_uri) == 0) {
 		return;
 	}
author	Ramiro Estrugo <ramiro@src.gnome.org>	2001-04-04 00:07:15 +0000
committer	Ramiro Estrugo <ramiro@src.gnome.org>	2001-04-04 00:07:15 +0000
commit	fbbaf803620a6a7cf4598b0b59406718da6fc778 (patch)
tree	5771ffd1b01df76f1837270f5f6f57f5092f20e9 /components
parent	9f9bfe2e5ff03c6829b4b8730b65cdc00051331d (diff)
download	nautilus-fbbaf803620a6a7cf4598b0b59406718da6fc778.tar.gz