diff -U 3 olvwm-4.0/pixmap.c olvwm-4.0-gentoo/pixmap.c
--- olvwm-4.0/pixmap.c	Sat Sep 25 12:16:05 1999
+++ olvwm-4.0-gentoo/pixmap.c	Thu May  2 03:07:15 2002
@@ -446,14 +446,14 @@
         int     i = 0;;
 
         if ((owHome = getenv("OPENWINHOME")) == NULL)
-                owHome = "/usr/openwin";
+                owHome = "/usr/share/olvwm";
 
         bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
 
-        (void)sprintf(bmPath, "%s/etc/workspace/patterns",owHome);
+        (void)sprintf(bmPath, "%s/patterns",owHome);
         bitmapSearchPath[i++] = MemNewString(bmPath);
 
-        (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
+        (void)sprintf(bmPath, "%s/bitmaps",owHome);
         bitmapSearchPath[i++] = MemNewString(bmPath);
 
         bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
diff -U 3 olvwm-4.0/screen.c olvwm-4.0-gentoo/screen.c
--- olvwm-4.0/screen.c	Sat Sep 25 12:16:05 1999
+++ olvwm-4.0-gentoo/screen.c	Thu May  2 03:07:51 2002
@@ -523,14 +523,14 @@
 	int     i = 0;;
 
 	if ((owHome = getenv("OPENWINHOME")) == NULL)
-		owHome = "/usr/openwin";
+		owHome = "/usr/share/olvwm";
 
 	bitmapSearchPath = (char **)MemAlloc(4 * sizeof(char *));
 
-	(void)sprintf(bmPath, "%s/etc/workspace/patterns",owHome);
+	(void)sprintf(bmPath, "%s/patterns",owHome);
 	bitmapSearchPath[i++] = MemNewString(bmPath);
  
-	(void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome);
+	(void)sprintf(bmPath, "%s/bitmaps",owHome);
 	bitmapSearchPath[i++] = MemNewString(bmPath);
 
 	bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps");
diff -U 3 olvwm-4.0/usermenu.c olvwm-4.0-gentoo/usermenu.c
--- olvwm-4.0/usermenu.c	Sat Sep 25 12:16:05 1999
+++ olvwm-4.0-gentoo/usermenu.c	Thu May  2 03:24:15 2002
@@ -526,17 +526,17 @@
 
     b = 0;
 
-    buttons[b++] = createSimpleButton(GetNewText("xterm"), NULL,
+    buttons[b++] = createSimpleButton(GetNewText("Bash"), NULL,
 				      AppMenuFunc,
-				      MemNewString("xterm"));
+				      MemNewString("xterm -ls -rv -e bash"));
     
-    buttons[b++] = createSimpleButton(GetNewText("emacs"), NULL,
+    buttons[b++] = createSimpleButton(GetNewText("Emacs"), NULL,
 				     AppMenuFunc,
 				     MemNewString("emacs"));
     
-    buttons[b++] = createSimpleButton(GetNewText("Netscape"), NULL,
+    buttons[b++] = createSimpleButton(GetNewText("Browser"), NULL,
 				     AppMenuFunc,
-				     MemNewString("netscape"));    
+				     MemNewString("opera||mozilla||netscape")); 
  
     buttons[b++] = createSeparatorButton();
  
@@ -862,7 +862,7 @@
 		home = ".";
  
 	if ((owHome = getenv("OPENWINHOME")) == NULL)
-		owHome = "/usr/openwin";
+		owHome = "/usr/share/olvwm";
  
 	menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *));
  
@@ -892,8 +892,8 @@
 	sprintf(buf, "%s/lib/%%s", owHome);
 	menuSearchPath[i++] = MemNewString(buf);
 
-	/* /usr/openwin/lib/<menufile> */
-	menuSearchPath[i++] = MemNewString("/usr/openwin/lib/%s");
+	/* /usr/share/olvwm/<menufile> */
+	menuSearchPath[i++] = MemNewString("/usr/share/olvwm/%s");
 
 	menuSearchPath[i] = (char *)NULL;