Update to Afterstep-1.7.165

Numerous bug fixes, too many to list. Some experimental patches backed
out in preparation for a stable release. New "themes" menu and associated
scripts, for installing themes, or to bundle your own.

This is considered to be a "release candidate".

3 files changed, 49 insertions, 168 deletions

diff --git a/x11/afterstep-current/Makefile b/x11/afterstep-current/Makefile
index d57bfa78d97..692bd51d7cf 100644
--- a/x11/afterstep-current/Makefile
+++ b/x11/afterstep-current/Makefile
@@ -1,37 +1,23 @@
-# $NetBSD: Makefile,v 1.15 1999/11/14 20:19:03 fredb Exp $
+# $NetBSD: Makefile,v 1.16 2000/01/13 06:35:11 fredb Exp $
 
-DISTNAME=		AfterStep-1.7.142
-PKGNAME=		afterstep-1.7.157
-CATEGORIES=		x11
-MASTER_SITES=		ftp://ftp.afterstep.org/devel/snapshots/ \
-			ftp://ftp.afterstep.org/devel/archives/1.7/ \
-	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/snapshots/ \
-	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/archives/1.7/
-#MASTER_SITES=		ftp://ftp.afterstep.org/pub/stable/ \
-#	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/stable/
-EXTRACT_SUFX=		.tar.bz2
+DISTNAME=	AfterStep-1.7.164
+PKGNAME=	afterstep-1.7.165
+CATEGORIES=	x11
+MASTER_SITES=	ftp://ftp.afterstep.org/devel/snapshots/ \
+		ftp://ftp.afterstep.org/devel/archives/1.7/ \
+		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/snapshots/ \
+		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/archives/1.7/
+#MASTER_SITES=	ftp://ftp.afterstep.org/pub/stable/ \
+#		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/stable/
+EXTRACT_SUFX=	.tar.bz2
 
-PATCH_SITES=		ftp://ftp.afterstep.org/devel/patches/ \
-			ftp://ftp.afterstep.org/devel/patches/contrib/ \
-			ftp://ftp.afterstep.org/devel/patches/archive/ \
-	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/ \
-	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/contrib/ \
-	ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/archive/
-PATCHFILES=	1.7.142-01-sasha-png_jpg_warnings.patch.gz \
-		1.7.142-02-tildouf-wharf_transient_and_Audio_fix.patch.gz \
-		1.7.142-03-allanon-icons_and_wharf.patch.gz \
-		1.7.142-04-allanon-desk_and_shaped_icons_and_wharf_reswallow.patch.gz \
-		1.7.142-05-allanon-desks_and_wharf.patch.gz \
-		1.7.142-06-sasha-menus_and_more.patch.gz \
-		1.7.142-07-sasha-winfunctions_scroll.patch.gz \
-		1.7.142-08-sasha-functions-gamma-etc.patch.gz \
-		1.7.142-09-sasha-borders_myframes_more.patch.gz \
-		1.7.142-10-allanon-avoidcover.patch.gz \
-		1.7.142-11-sasha-icons_shade_gamma.patch.gz \
-		1.7.142-12-allanon-window_position_and_shaping.patch.gz \
-		1.7.142-13-sasha-titlebuttons_mapping.patch.gz \
-		1.7.142-14-allanon-randomplacement_and_texturedhandle_and_shaped_windows.patch.gz \
-		1.7.142-15-allanon-disappearing_windows.patch.gz
+PATCH_SITES=	ftp://ftp.afterstep.org/devel/patches/ \
+		ftp://ftp.afterstep.org/devel/patches/contrib/ \
+		ftp://ftp.afterstep.org/devel/patches/archive/ \
+		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/ \
+		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/contrib/ \
+		ftp://ftp.digex.net/pub/X11/window-managers/afterstep/devel/patches/archive/
+PATCHFILES=		1.7.164-01-sasha-shade_titleballoons.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		fb@enteract.com
diff --git a/x11/afterstep-current/files/md5 b/x11/afterstep-current/files/md5
index 20a8e92adde..47763d86d3a 100644
--- a/x11/afterstep-current/files/md5
+++ b/x11/afterstep-current/files/md5
@@ -1,18 +1,4 @@
-$NetBSD: md5,v 1.10 1999/11/14 18:27:18 fredb Exp $
+$NetBSD: md5,v 1.11 2000/01/13 06:35:12 fredb Exp $
 
-MD5 (AfterStep/AfterStep-1.7.142.tar.bz2) = 7378c78b10025b1a313ab1c7dad079dd
-MD5 (AfterStep/1.7.142-01-sasha-png_jpg_warnings.patch.gz) = c49f966792fbb1ae1b13e553ec08c69e
-MD5 (AfterStep/1.7.142-02-tildouf-wharf_transient_and_Audio_fix.patch.gz) = 6c14c7c38594ab3ab931d63bded391cd
-MD5 (AfterStep/1.7.142-03-allanon-icons_and_wharf.patch.gz) = 7766e9273411c2471b744ff629354247
-MD5 (AfterStep/1.7.142-04-allanon-desk_and_shaped_icons_and_wharf_reswallow.patch.gz) = f8a0eb3e3cbdf560f0141be212c42f51
-MD5 (AfterStep/1.7.142-05-allanon-desks_and_wharf.patch.gz) = 8de347561133316be76d436ef58aa2b3
-MD5 (AfterStep/1.7.142-06-sasha-menus_and_more.patch.gz) = a67b96a04fceaf8628747ef4fc37b5d9
-MD5 (AfterStep/1.7.142-07-sasha-winfunctions_scroll.patch.gz) = 4fee86b0e52416989051994cdf87ff7f
-MD5 (AfterStep/1.7.142-08-sasha-functions-gamma-etc.patch.gz) = d7e9e8f7acc20df7af98fba579f8e833
-MD5 (AfterStep/1.7.142-09-sasha-borders_myframes_more.patch.gz) = 326bba819c04606523a254ce0456721f
-MD5 (AfterStep/1.7.142-10-allanon-avoidcover.patch.gz) = 7498b6e4ed3c8e4853a28b533ff0608b
-MD5 (AfterStep/1.7.142-11-sasha-icons_shade_gamma.patch.gz) = a5038834d13da773b8e2d0b2a17d1523
-MD5 (AfterStep/1.7.142-12-allanon-window_position_and_shaping.patch.gz) = cfbe28a494acafee82fcfe6dc2bdf44a
-MD5 (AfterStep/1.7.142-13-sasha-titlebuttons_mapping.patch.gz) = 0649543debe21973891032e274621a0c
-MD5 (AfterStep/1.7.142-14-allanon-randomplacement_and_texturedhandle_and_shaped_windows.patch.gz) = 5f6be0ffd489d58120f715fef8dac712
-MD5 (AfterStep/1.7.142-15-allanon-disappearing_windows.patch.gz) = 37d7fd49fe9c34f80e67600769769846
+MD5 (AfterStep/AfterStep-1.7.164.tar.bz2) = 3f5dc4fde457b560a4c7e22a8ce74bb2
+MD5 (AfterStep/1.7.164-01-sasha-shade_titleballoons.patch.gz) = 9d9fe45d840ac4238c1a7fb0582c6c2d
diff --git a/x11/afterstep-current/pkg/PLIST b/x11/afterstep-current/pkg/PLIST
index 957fc1887b0..44f353ce6f5 100644
--- a/x11/afterstep-current/pkg/PLIST
+++ b/x11/afterstep-current/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/09/03 11:12:27 fredb Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/01/13 06:35:12 fredb Exp $
 bin/ASSound
 bin/Animate
 bin/Audio
@@ -21,7 +21,11 @@ bin/afterstep
 bin/afterstepdoc
 bin/ascommand.pl
 bin/asetroot
+bin/astheme.sh
+bin/asthemecreate.sh
 bin/importasmenu
+bin/installastheme.pl
+bin/makeastheme.pl
 lib/libafterstep.a
 lib/libafterstep.so.1.5
 lib/libasConfig.a
@@ -53,16 +57,10 @@ share/afterstep/.workspace_state
 share/afterstep/Gnome
 share/afterstep/animate
 share/afterstep/asetroot
-share/afterstep/asmail
 share/afterstep/audio
 share/afterstep/autoexec
 share/afterstep/backgrounds/Back.xpm
 share/afterstep/backgrounds/BlueStone.xpm
-share/afterstep/backgrounds/Rain.xpm
-share/afterstep/backgrounds/RainHi.xpm
-share/afterstep/backgrounds/Wave.xpm
-share/afterstep/backgrounds/WaveHi.xpm
-share/afterstep/backgrounds/Waves.xpm
 share/afterstep/backgrounds/aquamarine.xpm
 share/afterstep/backgrounds/black.xpm
 share/afterstep/backgrounds/darkblue.xpm
@@ -79,28 +77,16 @@ share/afterstep/base.8bpp
 share/afterstep/clean
 share/afterstep/compatibility
 share/afterstep/database
-share/afterstep/desktop/buttons/1-e.xpm
 share/afterstep/desktop/buttons/1.xpm
-share/afterstep/desktop/buttons/1p-e.xpm
 share/afterstep/desktop/buttons/1p.xpm
-share/afterstep/desktop/buttons/2-e.xpm
 share/afterstep/desktop/buttons/2.xpm
-share/afterstep/desktop/buttons/2p-e.xpm
 share/afterstep/desktop/buttons/2p.xpm
-share/afterstep/desktop/buttons/3-e.xpm
 share/afterstep/desktop/buttons/3.xpm
-share/afterstep/desktop/buttons/3p-e.xpm
 share/afterstep/desktop/buttons/3p.xpm
-share/afterstep/desktop/buttons/4-e.xpm
 share/afterstep/desktop/buttons/4.xpm
-share/afterstep/desktop/buttons/4p-e.xpm
 share/afterstep/desktop/buttons/4p.xpm
-share/afterstep/desktop/buttons/5-e.xpm
 share/afterstep/desktop/buttons/5.xpm
-share/afterstep/desktop/buttons/5p-e.xpm
 share/afterstep/desktop/buttons/5p.xpm
-share/afterstep/desktop/buttons/as1.5-iconizeR.xpm
-share/afterstep/desktop/buttons/as1.5-iconizeR-p.xpm
 share/afterstep/desktop/buttons/as-iconize-pressed.xpm
 share/afterstep/desktop/buttons/as-iconize.xpm
 share/afterstep/desktop/buttons/as-kill-pressed.xpm
@@ -123,6 +109,8 @@ share/afterstep/desktop/buttons/as-switchwindow-c-pressed.xpm
 share/afterstep/desktop/buttons/as-switchwindow-c.xpm
 share/afterstep/desktop/buttons/as1.5-iconize-p.xpm
 share/afterstep/desktop/buttons/as1.5-iconize.xpm
+share/afterstep/desktop/buttons/as1.5-iconizeR-p.xpm
+share/afterstep/desktop/buttons/as1.5-iconizeR.xpm
 share/afterstep/desktop/buttons/as1.5-kill-p.xpm
 share/afterstep/desktop/buttons/as1.5-kill.xpm
 share/afterstep/desktop/buttons/as1.5-menu-p.xpm
@@ -141,14 +129,6 @@ share/afterstep/desktop/buttons/fuf-windowmenu-pressed.xpm
 share/afterstep/desktop/buttons/fuf-windowmenu.xpm
 share/afterstep/desktop/buttons/g_iconize.xpm
 share/afterstep/desktop/buttons/g_shut.xpm
-share/afterstep/desktop/buttons/os8-iconize-pressed.xpm
-share/afterstep/desktop/buttons/os8-iconize.xpm
-share/afterstep/desktop/buttons/os8-kill-pressed.xpm
-share/afterstep/desktop/buttons/os8-kill.xpm
-share/afterstep/desktop/buttons/os8-maximize-pressed.xpm
-share/afterstep/desktop/buttons/os8-maximize.xpm
-share/afterstep/desktop/buttons/os8-shade-pressed.xpm
-share/afterstep/desktop/buttons/os8-shade.xpm
 share/afterstep/desktop/cursors/cursor.xbm
 share/afterstep/desktop/cursors/cursor.xbm.mask
 share/afterstep/desktop/cursors/iconify.xbm
@@ -180,7 +160,6 @@ share/afterstep/desktop/icons/16bpp/ASBBlockTransparent.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockWater.xpm
 share/afterstep/desktop/icons/16bpp/ASBBlockWhite.xpm
 share/afterstep/desktop/icons/16bpp/AfterStep.xpm
-share/afterstep/desktop/icons/16bpp/AfterStep1.5_startmenu.xpm
 share/afterstep/desktop/icons/16bpp/AfterStep2.xpm
 share/afterstep/desktop/icons/16bpp/AfterStep3.xpm
 share/afterstep/desktop/icons/16bpp/AfterStep4.xpm
@@ -223,19 +202,6 @@ share/afterstep/desktop/icons/16bpp/author.xpm
 share/afterstep/desktop/icons/16bpp/cpuchip.xpm
 share/afterstep/desktop/icons/16bpp/disk.builder.xpm
 share/afterstep/desktop/icons/16bpp/draw.xpm
-share/afterstep/desktop/icons/16bpp/e-no.xpm
-share/afterstep/desktop/icons/16bpp/e0.xpm
-share/afterstep/desktop/icons/16bpp/e1.xpm
-share/afterstep/desktop/icons/16bpp/e10.xpm
-share/afterstep/desktop/icons/16bpp/e11.xpm
-share/afterstep/desktop/icons/16bpp/e2.xpm
-share/afterstep/desktop/icons/16bpp/e3.xpm
-share/afterstep/desktop/icons/16bpp/e4.xpm
-share/afterstep/desktop/icons/16bpp/e5.xpm
-share/afterstep/desktop/icons/16bpp/e6.xpm
-share/afterstep/desktop/icons/16bpp/e7.xpm
-share/afterstep/desktop/icons/16bpp/e8.xpm
-share/afterstep/desktop/icons/16bpp/e9.xpm
 share/afterstep/desktop/icons/16bpp/hostmanager.xpm
 share/afterstep/desktop/icons/16bpp/interface.xpm
 share/afterstep/desktop/icons/16bpp/linux-penguin.xpm
@@ -261,7 +227,6 @@ share/afterstep/desktop/icons/8bpp/ASBBlockTransparent.xpm
 share/afterstep/desktop/icons/8bpp/ASBBlockWater.xpm
 share/afterstep/desktop/icons/8bpp/ASBBlockWhite.xpm
 share/afterstep/desktop/icons/8bpp/AfterStep.xpm
-share/afterstep/desktop/icons/8bpp/AfterStep1.5_startmenu.xpm
 share/afterstep/desktop/icons/8bpp/AfterStep2.xpm
 share/afterstep/desktop/icons/8bpp/AfterStep3.xpm
 share/afterstep/desktop/icons/8bpp/AfterStep4.xpm
@@ -304,19 +269,6 @@ share/afterstep/desktop/icons/8bpp/author.xpm
 share/afterstep/desktop/icons/8bpp/cpuchip.xpm
 share/afterstep/desktop/icons/8bpp/disk.builder.xpm
 share/afterstep/desktop/icons/8bpp/draw.xpm
-share/afterstep/desktop/icons/8bpp/e-no.xpm
-share/afterstep/desktop/icons/8bpp/e0.xpm
-share/afterstep/desktop/icons/8bpp/e1.xpm
-share/afterstep/desktop/icons/8bpp/e10.xpm
-share/afterstep/desktop/icons/8bpp/e11.xpm
-share/afterstep/desktop/icons/8bpp/e2.xpm
-share/afterstep/desktop/icons/8bpp/e3.xpm
-share/afterstep/desktop/icons/8bpp/e4.xpm
-share/afterstep/desktop/icons/8bpp/e5.xpm
-share/afterstep/desktop/icons/8bpp/e6.xpm
-share/afterstep/desktop/icons/8bpp/e7.xpm
-share/afterstep/desktop/icons/8bpp/e8.xpm
-share/afterstep/desktop/icons/8bpp/e9.xpm
 share/afterstep/desktop/icons/8bpp/hostmanager.xpm
 share/afterstep/desktop/icons/8bpp/interface.xpm
 share/afterstep/desktop/icons/8bpp/linux-penguin.xpm
@@ -330,24 +282,11 @@ share/afterstep/desktop/icons/8bpp/widget.xpm
 share/afterstep/desktop/icons/8bpp/workshop.xpm
 share/afterstep/desktop/icons/8bpp/writeletter.xpm
 share/afterstep/desktop/icons/common/3_dots.xpm
-share/afterstep/desktop/icons/common/AfterStep7.xpm
-share/afterstep/desktop/icons/common/AfterStep8.xpm
-share/afterstep/desktop/icons/common/Earth.xpm
-share/afterstep/desktop/icons/common/Mail1.xpm
-share/afterstep/desktop/icons/common/Mail2.xpm
-share/afterstep/desktop/icons/common/Mail3.xpm
-share/afterstep/desktop/icons/common/World.xpm
 share/afterstep/desktop/icons/common/arrow-dots.xpm
 share/afterstep/desktop/icons/common/arrow.xpm
-share/afterstep/desktop/icons/common/bebutton.xpm
 share/afterstep/desktop/icons/common/bluebar.xpm
 share/afterstep/desktop/icons/common/darkbluebar.xpm
-share/afterstep/desktop/icons/common/e.xpm
 share/afterstep/desktop/icons/common/east.xpm
-share/afterstep/desktop/icons/common/fuf-new-menu-top.xpm
-share/afterstep/desktop/icons/common/fuf-new-top-focused.xpm
-share/afterstep/desktop/icons/common/fuf-new-top-unfocused.xpm
-share/afterstep/desktop/icons/common/fuf-wharf.xpm
 share/afterstep/desktop/icons/common/greenbar.xpm
 share/afterstep/desktop/icons/common/mini-app.xpm
 share/afterstep/desktop/icons/common/mini-as.xpm
@@ -355,36 +294,15 @@ share/afterstep/desktop/icons/common/mini-exit.xpm
 share/afterstep/desktop/icons/common/mini-folder.xpm
 share/afterstep/desktop/icons/common/mini-menu.xpm
 share/afterstep/desktop/icons/common/mini-recycler.xpm
-share/afterstep/desktop/icons/common/monitor-e0.xpm
-share/afterstep/desktop/icons/common/monitor-e1.xpm
-share/afterstep/desktop/icons/common/monitor-e10.xpm
-share/afterstep/desktop/icons/common/monitor-e11.xpm
-share/afterstep/desktop/icons/common/monitor-e2.xpm
-share/afterstep/desktop/icons/common/monitor-e3.xpm
-share/afterstep/desktop/icons/common/monitor-e4.xpm
-share/afterstep/desktop/icons/common/monitor-e5.xpm
-share/afterstep/desktop/icons/common/monitor-e6.xpm
-share/afterstep/desktop/icons/common/monitor-e7.xpm
-share/afterstep/desktop/icons/common/monitor-e8.xpm
-share/afterstep/desktop/icons/common/monitor-e9.xpm
-share/afterstep/desktop/icons/common/monitor-no.xpm
-share/afterstep/desktop/icons/common/n.xpm
-share/afterstep/desktop/icons/common/ne.xpm
-share/afterstep/desktop/icons/common/nw.xpm
 share/afterstep/desktop/icons/common/os8-title.xpm
 share/afterstep/desktop/icons/common/ostx.xpm
 share/afterstep/desktop/icons/common/ostxs.xpm
 share/afterstep/desktop/icons/common/ostxu.xpm
 share/afterstep/desktop/icons/common/redbar.xpm
-share/afterstep/desktop/icons/common/s.xpm
-share/afterstep/desktop/icons/common/se.xpm
 share/afterstep/desktop/icons/common/south.xpm
 share/afterstep/desktop/icons/common/southeast.xpm
 share/afterstep/desktop/icons/common/southwest.xpm
-share/afterstep/desktop/icons/common/sw.xpm
-share/afterstep/desktop/icons/common/w.xpm
 share/afterstep/desktop/icons/common/west.xpm
-share/afterstep/desktop/icons/common/xiterm.xpm
 share/afterstep/desktop/sounds/bong.au
 share/afterstep/desktop/sounds/clink.au
 share/afterstep/desktop/sounds/cowbell.au
@@ -416,29 +334,15 @@ share/afterstep/feels/feel.cursors
 share/afterstep/forms
 share/afterstep/ident
 share/afterstep/looks/look.AfterStep
-share/afterstep/looks/look.AfterStep1.5
-share/afterstep/looks/look.Black
 share/afterstep/looks/look.DEFAULT
-share/afterstep/looks/look.DeepBlue
-share/afterstep/looks/look.Ethan
-share/afterstep/looks/look.Ethan2
 share/afterstep/looks/look.Frames
 share/afterstep/looks/look.Guylhem
-share/afterstep/looks/look.MacOS8
 share/afterstep/looks/look.Metallic
+share/afterstep/looks/look.NEW
 share/afterstep/looks/look.Nextish
-share/afterstep/looks/look.NEW-stuff
 share/afterstep/looks/look.Ostx
 share/afterstep/looks/look.PureNext
-share/afterstep/looks/look.Sea
 share/afterstep/looks/look.Transparent.rev
-share/afterstep/looks/look.Water
-share/afterstep/looks/look.fuf
-share/afterstep/looks/look.grey
-share/afterstep/looks/look.greyblue
-share/afterstep/looks/look.lightblue
-share/afterstep/looks/look.lightgrey
-share/afterstep/looks/look.orchid
 share/afterstep/looks/look.purple
 share/afterstep/non-configurable/0_background
 share/afterstep/non-configurable/0_feel.15bpp
@@ -638,6 +542,9 @@ share/afterstep/start/Desktop/Mouse/8_normal
 share/afterstep/start/Desktop/Mouse/9_noaccel
 share/afterstep/start/Desktop/Mouse/9_slow
 share/afterstep/start/Desktop/Pictures/.include
+share/afterstep/start/Desktop/Theme/.include
+share/afterstep/start/Desktop/Theme/0_asthemecreate
+share/afterstep/start/Desktop/Theme/1_nop
 share/afterstep/start/Desktop/a_xearth
 share/afterstep/start/Desktop/b_fish
 share/afterstep/start/Desktop/c_snow
@@ -645,17 +552,11 @@ share/afterstep/start/Desktop/d_nop
 share/afterstep/start/Desktop/e_updatestart
 share/afterstep/start/Desktop/f_updateall
 share/afterstep/start/Modules/Animate
-share/afterstep/start/Modules/Animate_Stop
 share/afterstep/start/Modules/Audio
-share/afterstep/start/Modules/Audio_Stop
 share/afterstep/start/Modules/Auto
-share/afterstep/start/Modules/Auto_Stop
 share/afterstep/start/Modules/Banner
-share/afterstep/start/Modules/Banner_Stop
 share/afterstep/start/Modules/Cascade
-share/afterstep/start/Modules/Cascade_Stop
 share/afterstep/start/Modules/Clean
-share/afterstep/start/Modules/Clean_Stop
 share/afterstep/start/Modules/Forms/1_ftp
 share/afterstep/start/Modules/Forms/2_find
 share/afterstep/start/Modules/Forms/3_help
@@ -665,28 +566,34 @@ share/afterstep/start/Modules/Forms/6_screenshot
 share/afterstep/start/Modules/Forms/7_windowshot
 share/afterstep/start/Modules/Forms/8_xlock
 share/afterstep/start/Modules/Gnome
-share/afterstep/start/Modules/Gnome_Stop
 share/afterstep/start/Modules/Ident
-share/afterstep/start/Modules/Ident_Stop
 share/afterstep/start/Modules/Pager
-share/afterstep/start/Modules/Pager_Stop
 share/afterstep/start/Modules/Scripts/0_animate
 share/afterstep/start/Modules/Scripts/1_bellsetup
 share/afterstep/start/Modules/Scripts/2_desksetup
 share/afterstep/start/Modules/Scripts/3_quit
 share/afterstep/start/Modules/Scripts/4_screendump
 share/afterstep/start/Modules/Scroll
-share/afterstep/start/Modules/Scroll_Stop
+share/afterstep/start/Modules/Stop/Animate_Stop
+share/afterstep/start/Modules/Stop/Audio_Stop
+share/afterstep/start/Modules/Stop/Auto_Stop
+share/afterstep/start/Modules/Stop/Banner_Stop
+share/afterstep/start/Modules/Stop/Cascade_Stop
+share/afterstep/start/Modules/Stop/Clean_Stop
+share/afterstep/start/Modules/Stop/Gnome_Stop
+share/afterstep/start/Modules/Stop/Ident_Stop
+share/afterstep/start/Modules/Stop/Pager_Stop
+share/afterstep/start/Modules/Stop/Scroll_Stop
+share/afterstep/start/Modules/Stop/Tile_Stop
+share/afterstep/start/Modules/Stop/Wharf_Stop
+share/afterstep/start/Modules/Stop/WinList_Stop
+share/afterstep/start/Modules/Stop/Zharf_Stop
+share/afterstep/start/Modules/Stop/asetroot_Stop
 share/afterstep/start/Modules/Tile
-share/afterstep/start/Modules/Tile_Stop
 share/afterstep/start/Modules/Wharf
-share/afterstep/start/Modules/Wharf_Stop
 share/afterstep/start/Modules/WinList
-share/afterstep/start/Modules/WinList_Stop
 share/afterstep/start/Modules/Zharf
-share/afterstep/start/Modules/Zharf_Stop
 share/afterstep/start/Modules/asetroot
-share/afterstep/start/Modules/asetroot_Stop
 share/afterstep/start/Quit/0_close
 share/afterstep/start/Quit/1_exit
 share/afterstep/start/Quit/2_nop
@@ -732,9 +639,11 @@ share/afterstep/zharf
 @dirrm share/afterstep/start/Screen_savers/With_password
 @dirrm share/afterstep/start/Screen_savers
 @dirrm share/afterstep/start/Quit
+@dirrm share/afterstep/start/Modules/Stop
 @dirrm share/afterstep/start/Modules/Scripts
 @dirrm share/afterstep/start/Modules/Forms
 @dirrm share/afterstep/start/Modules
+@dirrm share/afterstep/start/Desktop/Theme
 @dirrm share/afterstep/start/Desktop/Pictures
 @dirrm share/afterstep/start/Desktop/Mouse
 @dirrm share/afterstep/start/Desktop/Look