gistfile1.txt

diff --git a/default-config/Makefile.am b/default-config/Makefile.am
index 4021a80..55ec99b 100644
--- a/default-config/Makefile.am
+++ b/default-config/Makefile.am
@@ -4,7 +4,8 @@ configdir = @FVWM_DATADIR@/default-config
 IMAGES_DIR != find images -type d
 config_DATA = config \
 	      FvwmScript-DateTime \
-	      FvwmScript-Quit
+	      FvwmScript-Quit \
+	      .stalonetrayrc
 
 install-data-hook:
 		cp -r images @FVWM_DATADIR@/default-config
diff --git a/default-config/config b/default-config/config
index 5ec2568..7499cb9 100644
--- a/default-config/config
+++ b/default-config/config
@@ -31,6 +31,13 @@
 # that FvwmConsole uses. Change this to your terminal of choice
 InfoStoreAdd terminal xterm
 
+DestroyFunc ScriptPaths
+AddToFunc   ScriptPaths
++ I Test (f $[FVWM_USERDIR]/FvwmScript-Quit) \
+    InfoStoreAdd ScriptPath $[FVWM_USERDIR]
++ I TestRc (NoMatch) Test (f $[FVWM_DATADIR]/default-config/FvwmScript-Quit) \
+    InfoStoreAdd ScriptPath $[FVWM_DATADIR]/default-config
+
 #######
 # 1: Functions
 #
@@ -57,6 +64,7 @@ InfoStoreAdd terminal xterm
 ###########
 DestroyFunc StartFunction
 AddToFunc StartFunction
++ I Test (Init) ScriptPaths
 + I Test (Init) Exec exec fvwm-root $[FVWM_USERDIR]/.BGdefault
 + I Test (Init) Module FvwmBanner
 + I Test (Restart) Exec exec true
@@ -316,7 +324,7 @@ AddToMenu MenuFvwmRoot "Fvwm" Title
 + "" Nop
 + "Refresh%icons/refresh.png%" Refresh
 + "Restart%icons/restart.png%" Restart
-+ "Quit%icons/quit.png%" Module FvwmScript $[FVWM_USERDIR]/FvwmScript-Quit
++ "Quit%icons/quit.png%" Module FvwmScript $[infostore.ScriptPath]/FvwmScript-Quit
 
 # Generate XDGMenu
 # Requires python fvwm-menu-desktop script from fvwm 2.6.6+
@@ -631,7 +639,8 @@ Test (x stalonetray) PipeRead 'echo "*RightPanel: (120x$(($[vp.height]-225)), To
     Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
 Test (!x stalonetray) PipeRead 'echo "*RightPanel: (120x$(($[vp.height]-205)), Top, \
     Swallow FvwmIconMan \'Module FvwmIconMan\', Frame 0)"'
-*RightPanel: (120x45, Swallow DateTime 'Module FvwmScript $[FVWM_USERDIR]/FvwmScript-DateTime', Frame 0)
+*RightPanel: (120x45, Swallow DateTime \
+    "Module FvwmScript $[infostore.ScriptPath]/FvwmScript-DateTime", Frame 0)
 *RightPanel: (120x5, Frame 0)