diff --git a/capplets/background/background-capplet.png b/capplets/background/background-capplet.png
new file mode 100644
index 000000000..28b08e09e
Binary files /dev/null and b/capplets/background/background-capplet.png differ
diff --git a/capplets/keyboard/.cvsignore b/capplets/keyboard/.cvsignore
index eaf236a01..14d292eb9 100644
--- a/capplets/keyboard/.cvsignore
+++ b/capplets/keyboard/.cvsignore
@@ -7,5 +7,5 @@ Makefile.in
 *.o
 keyboard-properties
 keyboard-properties-capplet
-keyboard-properties.desktop
-keyboard-properties.desktop.in
+keyboard.desktop
+keyboard.desktop.in
diff --git a/capplets/keyboard/ChangeLog b/capplets/keyboard/ChangeLog
index ca93f16d0..31f014230 100644
--- a/capplets/keyboard/ChangeLog
+++ b/capplets/keyboard/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-17  Chema Celorio  <chema@celorio.com>
+
+	* Makefile.am: nice and clean just as we like it
+
 2001-07-17  Bradford Hovinen  <hovinen@ximian.com>
 
 	* Makefile.am (EXTRA_DIST): Added missing icons_DATA
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index 2608e7802..fd1053ece 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -1,42 +1,21 @@
 @XML_I18N_MERGE_DESKTOP_RULE@
+@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 
-cappletname=keyboard
+cappletname = keyboard
 
-Gladedir = $(datadir)/control-center-data
-Glade_DATA = $(cappletname)-properties.glade
-
-INCLUDES = \
-     -DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
-	@GNOMECC_CAPPLETS_CFLAGS@
+INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
 
 bin_PROGRAMS = keyboard-properties
 
-keyboard_properties_SOURCES = \
-	prefs-widget.c prefs-widget.h \
-	preferences.c  preferences.h \
-	main.c
-
 keyboard_properties_LDADD = @CAPPLET_LIBS@ $(XF86MISC_LIBS)
+keyboard_properties_SOURCES = \
+	main.c \
+	prefs-widget.c		prefs-widget.h \
+	preferences.c		preferences.h
 
-# desktop.in.in -> desktop.in -> desktop
-#
-desktop = $(cappletname)-properties.desktop
-
-iconsdir = $(GNOMECC_ICONS_DIR)
-icons_DATA = keyboard-capplet.png
-
-$(desktop).in: %.desktop.in: %.desktop.in.in
-	sed s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/$(cappletname)-capplet.png# < $< > $(cappletname)-properties.desktop.in
-
-install-data-local:
-	$(mkinstalldirs) $(datadir)/control-center/capplets/
-	$(INSTALL_DATA) $(srcdir)/$(desktop) $(datadir)/control-center/capplets/$(desktop)
-
-install-data-am: install-data-local
+desktop = $(cappletname).desktop
 
 all-local: $(desktop)
 
-EXTRA_DIST =					\
-  $(Glade_DATA)					\
-  $(GNOMECC_CAPPLETS_EXTRA_DIST)		\
-  $(icons_DATA)
diff --git a/capplets/keyboard/keyboard-properties.desktop.in.in b/capplets/keyboard/keyboard.desktop.in.in
similarity index 100%
rename from capplets/keyboard/keyboard-properties.desktop.in.in
rename to capplets/keyboard/keyboard.desktop.in.in
diff --git a/capplets/mouse/mouse-capplet.png b/capplets/mouse/mouse-capplet.png
new file mode 100644
index 000000000..c085f67ac
Binary files /dev/null and b/capplets/mouse/mouse-capplet.png differ
diff --git a/capplets/screensaver/screensaver-capplet.png b/capplets/screensaver/screensaver-capplet.png
new file mode 100644
index 000000000..a459506e7
Binary files /dev/null and b/capplets/screensaver/screensaver-capplet.png differ
diff --git a/capplets/sound/sound-capplet.png b/capplets/sound/sound-capplet.png
new file mode 100644
index 000000000..12a18763b
Binary files /dev/null and b/capplets/sound/sound-capplet.png differ
diff --git a/configure.in b/configure.in
index a950931b0..77a7f5f54 100644
--- a/configure.in
+++ b/configure.in
@@ -115,7 +115,7 @@ PKG_CHECK_MODULES(ARCHIVER, bonobo bonobo_conf xml)
 PKG_CHECK_MODULES(MONIKER, bonobo bonobo_conf xml)
 PKG_CHECK_MODULES(CONFIG_ARCHIVER, gnome xml)
 
-GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"keyboard-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\""
+GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} -I\$(top_srcdir)/intl -I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"keyboard-properties\\\"\" -DGLADE_DATADIR=\"\\\"${datadir}/control-center\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\"  "
 
 AC_DEFINE_UNQUOTED(GNOMECC_ICONS_DIR, "${datadir}/${PACKAGE}/icons")
 GNOMECC_ICONS_DIR=""${datadir}/${PACKAGE}/icons""
@@ -126,10 +126,48 @@ AC_SUBST(GNOMECC_CAPPLETS_CFLAGS)
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 
+GNOMECC_CAPPLETS_CLEANFILES="\$(desktop) \$(desktop).in"
+GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(desktop).in.in \$(desktop).in \$(desktop) \$(cappletname)-capplet.png \$(cappletname)-properties.glade"
+
+AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
+AC_SUBST(GNOMECC_CAPPLETS_CLEANFILES)
 dnl =======================================
 dnl Variables for config_archiverConf.sh.in
 dnl =======================================
 
+
+
+
+dnl ==============================================
+dnl End : Macro for the common code
+dnl ==============================================
+AC_DEFUN(AC_PROG_GNOMECC_CAPPLETS,
+[
+GNOMECC_CAPPLETS_DESKTOP_IN_RULE='iconsdir = $(GNOMECC_ICONS_DIR) \
+icons_DATA = $(cappletname)-capplet.png \
+Gladedir = $(datadir)/control-center-data \
+Glade_DATA = $(cappletname)-properties.glade \
+\
+$(desktop).in: \%.desktop.in: \%.desktop.in.in\
+	sed s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png# < $< \> ${cappletname}.desktop.in\
+\
+install-data-local:\
+	$(mkinstalldirs) $(datadir)/control-center/capplets\
+	$(INSTALL_DATA) $(srcdir)/$(desktop) $(datadir)/control-center/capplets/$(desktop)\
+install-data-am: install-data-local'
+AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
+s%@GNOMECC_CAPPLETS_DESKTOP_IN_RULE@%[$]GNOMECC_CAPPLETS_DESKTOP_IN_RULE%g
+AC_DIVERT_POP()dnl
+# Redirect the config.log output again, so that the ltconfig log is not
+# clobbered by the next message.
+exec 5>>./config.log
+])
+AC_PROG_GNOMECC_CAPPLETS
+dnl ==============================================
+dnl End : Macro for the common code
+dnl ==============================================
+
+
 CONFIG_ARCHIVER_LIBDIR='-L${libdir}'
 CONFIG_ARCHIVER_LIBS="$CONFIG_ARCHIVER_LIBS -lconfig_archiver"
 CONFIG_ARCHIVER_INCLUDEDIR="$CONFIG_ARCHIVER_CFLAGS -I${includedir}"
@@ -138,9 +176,6 @@ AC_SUBST(CONFIG_ARCHIVER_LIBDIR)
 AC_SUBST(CONFIG_ARCHIVER_LIBS)
 AC_SUBST(CONFIG_ARCHIVER_INCLUDEDIR)
 
-GNOMECC_CAPPLETS_EXTRA_DIST="ChangeLog \$(cappletname)-properties.desktop \$(cappletname)-properties.desktop.in \$(cappletname)-properties.desktop.in.in"
-
-AC_SUBST(GNOMECC_CAPPLETS_EXTRA_DIST)
 
 AC_OUTPUT([
 control-center.spec