diff --git a/capplets/screensaver/Makefile.am b/capplets/screensaver/Makefile.am
new file mode 100644
index 000000000..5687c029a
--- /dev/null
+++ b/capplets/screensaver/Makefile.am
@@ -0,0 +1,50 @@
+pixmapdir = $(datadir)/pixmaps
+pixmap_DATA = \
+ no-hack.png
+
+Applicationsdir = $(datadir)/control-center/Desktop
+Applications_DATA = \
+ screensaver-properties.desktop
+
+SUBDIRS = screensavers
+
+EXTRA_DIST = ChangeLog TODO $(Applications_DATA) $(pixmap_DATA) \
+ checked.xpm unchecked.xpm checked-disabled.xpm unchecked-disabled.xpm
+
+INCLUDES = \
+ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+ -DSSPROP_DATADIR=\""${prefix}/share/screensaver-properties"\" \
+ -DG_LOG_DOMAIN=\"screensaver-properties\" \
+ $(GNOME_INCLUDEDIR) \
+ $(LIBGLADE_CFLAGS) \
+ $(XML_CFLAGS) \
+ -I$(top_srcdir)/
+ -I../intl
+ -I$(top_srcdir)/intl
+ -I$(top_srcdir)/control-center
+
+bin_PROGRAMS = screensaver-properties-capplet
+
+screensaver_properties_capplet_SOURCES = \
+ prefs-widget.c prefs-widget.h\
+ preferences.c preferences.h\
+ screensaver-prefs-dialog.c screensaver-prefs-dialog.h\
+ selection-dialog.c selection-dialog.h \
+ pref-file.c pref-file.h \
+ preview.c preview.h \
+ expr.c expr.h \
+ daemon.c daemon.h \
+ rc-parse.c rc-parse.h \
+ resources.c resources.h \
+ XScreenSaver_ad.h \
+ main.c
+
+screensaver_properties_capplet_LDADD = \
+ $(GNOME_LIBDIR) \
+ $(GNOMEUI_LIBS) \
+ $(ORBIT_LIBS) \
+ $(LIBGLADE_LIBS) \
+ $(GNOME_XML_LIB) \
+ -lXt \
+ -lgdk_pixbuf \
+ ../../control-center/libcapplet.la
diff --git a/capplets/screensaver/screensavers/Makefile.am b/capplets/screensaver/screensavers/Makefile.am
new file mode 100644
index 000000000..a49fb640e
--- /dev/null
+++ b/capplets/screensaver/screensavers/Makefile.am
@@ -0,0 +1,4 @@
+Screensaversdir = $(datadir)/screensavers
+Screensavers_DATA = \
+ hacks.xml \
+ qix-settings.glade
diff --git a/capplets/screensaver/screensavers/hacks.xml b/capplets/screensaver/screensavers/hacks.xml
new file mode 100644
index 000000000..765d8756c
--- /dev/null
+++ b/capplets/screensaver/screensavers/hacks.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/capplets/screensaver/screensavers/qix-settings.glade b/capplets/screensaver/screensavers/qix-settings.glade
new file mode 100644
index 000000000..ba50ec634
--- /dev/null
+++ b/capplets/screensaver/screensavers/qix-settings.glade
@@ -0,0 +1,839 @@
+
+
+
+
+ Screensaver-properties-capplet
+ screensaver-properties-capplet
+
+ src
+ pixmaps
+ C
+ True
+ True
+
+
+
+ GtkWindow
+ window
+ window1
+ GTK_WINDOW_TOPLEVEL
+ GTK_WIN_POS_NONE
+ False
+ False
+ True
+ False
+
+
+ GtkTable
+ widget
+ 10
+ 7
+ 3
+ False
+ 5
+ 5
+
+
+ GtkOptionMenu
+ shape_widget
+ True
+ Lines
+Polygons
+
+ 0
+
+ 0
+ 1
+ 0
+ 1
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkTable
+ table2
+ 8
+ 3
+ False
+ 5
+ 5
+
+ 0
+ 3
+ 3
+ 4
+ 0
+ 0
+ False
+ True
+ False
+ False
+ True
+ True
+
+
+
+ GtkHScale
+ speed_widget
+ True
+ False
+ GTK_POS_TOP
+ 1
+ GTK_UPDATE_CONTINUOUS
+ 10000
+ 0
+ 20000
+ 0
+ 0
+ 0
+
+ 1
+ 2
+ 1
+ 2
+ 0
+ 0
+ True
+ True
+ False
+ False
+ True
+ True
+
+
+
+
+ GtkHScale
+ length_widget
+ True
+ False
+ GTK_POS_TOP
+ 1
+ GTK_UPDATE_CONTINUOUS
+ 50
+ 0
+ 1000
+ 0
+ 0
+ 0
+
+ 1
+ 2
+ 3
+ 4
+ 0
+ 0
+ False
+ True
+ False
+ False
+ True
+ True
+
+
+
+
+ GtkHScale
+ width_widget
+ True
+ False
+ GTK_POS_TOP
+ 1
+ GTK_UPDATE_CONTINUOUS
+ 100
+ 0
+ 1000
+ 0
+ 0
+ 0
+
+ 1
+ 2
+ 5
+ 6
+ 0
+ 0
+ False
+ True
+ False
+ False
+ True
+ True
+
+
+
+
+ GtkLabel
+ label21
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 0
+ 3
+ 0
+ 1
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ width_label
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 0
+ 3
+ 4
+ 5
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ label22
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 0
+ 3
+ 2
+ 3
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ width_low_label
+
+ GTK_JUSTIFY_RIGHT
+ False
+ 1
+ 0.5
+ 0
+ 0
+
+ 0
+ 1
+ 5
+ 6
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ width_high_label
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 2
+ 3
+ 5
+ 6
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ label18
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 2
+ 3
+ 3
+ 4
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ label16
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 2
+ 3
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ label15
+
+ GTK_JUSTIFY_RIGHT
+ False
+ 1
+ 0.5
+ 0
+ 0
+
+ 0
+ 1
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ label17
+
+ GTK_JUSTIFY_RIGHT
+ False
+ 1
+ 0.5
+ 0
+ 0
+
+ 0
+ 1
+ 3
+ 4
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkHScale
+ spread_widget
+ True
+ False
+ GTK_POS_TOP
+ 1
+ GTK_UPDATE_CONTINUOUS
+ 8
+ 0
+ 30
+ 0
+ 0
+ 0
+
+ 1
+ 2
+ 7
+ 8
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ True
+
+
+
+
+ GtkLabel
+ spread_label
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 0
+ 3
+ 6
+ 7
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ spread_low_label
+
+ GTK_JUSTIFY_RIGHT
+ False
+ 1
+ 0.5
+ 0
+ 0
+
+ 0
+ 1
+ 7
+ 8
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ spread_high_label
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 2
+ 3
+ 7
+ 8
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+
+ GtkLabel
+ no_pts_label
+
+ GTK_JUSTIFY_RIGHT
+ False
+ 1
+ 0.5
+ 0
+ 0
+
+ 1
+ 2
+ 0
+ 1
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ label5
+
+ GTK_JUSTIFY_RIGHT
+ False
+ 1
+ 0.5
+ 0
+ 0
+
+ 0
+ 2
+ 4
+ 5
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkCheckButton
+ gravity_widget
+ True
+
+ False
+ True
+
+ 0
+ 3
+ 2
+ 3
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkTable
+ table3
+ 2
+ 3
+ False
+ 5
+ 5
+
+ 0
+ 3
+ 6
+ 7
+ 0
+ 0
+ False
+ True
+ False
+ False
+ True
+ True
+
+
+
+ GtkLabel
+ shift_low_label
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 0
+ 1
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ shift_high_label
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 2
+ 3
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ shift_label
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 0
+ 3
+ 0
+ 1
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkHScale
+ shift_widget
+ True
+ False
+ GTK_POS_TOP
+ 1
+ GTK_UPDATE_CONTINUOUS
+ 8.4
+ 0
+ 25
+ 0
+ 0
+ 0
+
+ 1
+ 2
+ 1
+ 2
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ True
+
+
+
+
+
+ GtkOptionMenu
+ use_color_widget
+ True
+ Full Color
+Monochrome
+
+ 0
+
+ 0
+ 3
+ 5
+ 6
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkOptionMenu
+ trail_type_widget
+ True
+ Discrete Lines
+Solid Trails
+Transparent Trails
+XOR Trails
+
+ 0
+
+ 0
+ 3
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkSpinButton
+ count_widget
+ True
+ 1
+ 0
+ False
+ GTK_UPDATE_ALWAYS
+ False
+ False
+ 1
+ 0
+ 100
+ 1
+ 10
+ 10
+
+ 2
+ 3
+ 4
+ 5
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkSpinButton
+ no_pts_widget
+ True
+ 1
+ 0
+ False
+ GTK_UPDATE_ALWAYS
+ False
+ False
+ 3
+ 3
+ 100
+ 1
+ 10
+ 10
+
+ 2
+ 3
+ 0
+ 1
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+
+