diff -ruN wmaker-wmaker-0.95.5-orig/WINGs/wapplication.c wmaker-wmaker-0.95.5/WINGs/wapplication.c
--- wmaker-wmaker-0.95.5-orig/WINGs/wapplication.c	2013-08-29 13:36:52.000000000 -0500
+++ wmaker-wmaker-0.95.5/WINGs/wapplication.c	2023-04-25 05:14:15.000000000 -0500
@@ -158,15 +158,11 @@
 	if (path)
 		goto out;
 
-	path = checkFile("/usr/local/GNUstep", appdir, ext, resource);
-	if (path)
-		goto out;
-
 	path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
 	if (path)
 		goto out;
 
-	path = checkFile("/usr/GNUstep", appdir, ext, resource); /* falls through */
+	path = checkFile("@PREFIX@/lib/GNUstep", appdir, ext, resource); /* falls through */
 
 out:
 	if (tmp)
diff -ruN wmaker-wmaker-0.95.5-orig/WPrefs.app/Menu.c wmaker-wmaker-0.95.5/WPrefs.app/Menu.c
--- wmaker-wmaker-0.95.5-orig/WPrefs.app/Menu.c	2013-08-29 13:36:52.000000000 -0500
+++ wmaker-wmaker-0.95.5/WPrefs.app/Menu.c	2023-04-25 05:18:06.000000000 -0500
@@ -464,7 +464,7 @@
 		data->param.exec.command = _("%A(Run,Type command to run)");
 
 		data = putNewItem(panel, pad, ExecInfo, _("Firefox"));
-		data->param.exec.command = "firefox";
+		data->param.exec.command = "open -b org.mozilla.firefox";
 
 		data = putNewItem(panel, pad, ExecInfo, _("gimp"));
 		data->param.exec.command = "gimp";
@@ -518,19 +518,19 @@
 		data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
 		data->param.directory.command = "setstyle";
 		data->param.directory.directory =
-		    "/usr/share/WindowMaker/Themes /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
+		    "@PREFIX@/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes";
 		data->param.directory.stripExt = 1;
 
 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (scale)"));
 		data->param.directory.command = "wmsetbg -u -s";
 		data->param.directory.directory =
-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+		    "@PREFIX@/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
 		data->param.directory.stripExt = 1;
 
 		data = putNewItem(panel, pad, DirectoryInfo, _("Bg Images (tile)"));
 		data->param.directory.command = "wmsetbg -u -t";
 		data->param.directory.directory =
-		    "/opt/kde2/share/wallpapers /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
+		    "@PREFIX@/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds";
 		data->param.directory.stripExt = 1;
 
 		smenu = putNewSubmenu(pad, _("Assorted XTerms"));
diff -ruN wmaker-wmaker-0.95.5-orig/WPrefs.app/Paths.c wmaker-wmaker-0.95.5/WPrefs.app/Paths.c
--- wmaker-wmaker-0.95.5-orig/WPrefs.app/Paths.c	2013-08-29 13:36:52.000000000 -0500
+++ wmaker-wmaker-0.95.5/WPrefs.app/Paths.c	2023-04-25 05:19:15.000000000 -0500
@@ -79,9 +79,7 @@
 		addPathToList(panel->icoL, -1, "~/pixmaps");
 		addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
 		addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
-		addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
-		addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
+		addPathToList(panel->icoL, -1, "@PREFIX@/share/WindowMaker/Icons");
 	} else {
 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
 			val = WMGetFromPLArray(array, i);
@@ -95,7 +93,7 @@
 			wwarning(_("bad value in option PixmapPath. Using default path list"));
 		addPathToList(panel->pixL, -1, "~/pixmaps");
 		addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
-		addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+		addPathToList(panel->pixL, -1, "@PREFIX@/share/WindowMaker/Pixmaps");
 	} else {
 		for (i = 0; i < WMGetPropListItemCount(array); i++) {
 			val = WMGetFromPLArray(array, i);
diff -ruN wmaker-wmaker-0.95.5-orig/WindowMaker/Defaults/WindowMaker.in wmaker-wmaker-0.95.5/WindowMaker/Defaults/WindowMaker.in
--- wmaker-wmaker-0.95.5-orig/WindowMaker/Defaults/WindowMaker.in	2013-08-29 13:36:52.000000000 -0500
+++ wmaker-wmaker-0.95.5/WindowMaker/Defaults/WindowMaker.in	2023-04-25 05:20:04.000000000 -0500
@@ -15,9 +15,8 @@
     "/usr/include/X11/pixmaps",
     "~/GNUstep/Library/WindowMaker/Pixmaps",
     "~/GNUstep/Library/WindowMaker/CachedPixmaps",
-    "/usr/share/icons",
-    "/usr/local/share/pixmaps",
-    "/usr/share/pixmaps"
+    "@PREFIX@/share/icons",
+    "@PREFIX@/share/pixmaps"
   );
   PixmapPath = (
     "~/GNUstep/Library/WindowMaker/Pixmaps",
diff -ruN wmaker-wmaker-0.95.5-orig/util/wmaker.inst.in wmaker-wmaker-0.95.5/util/wmaker.inst.in
--- wmaker-wmaker-0.95.5-orig/util/wmaker.inst.in	2013-08-29 13:36:52.000000000 -0500
+++ wmaker-wmaker-0.95.5/util/wmaker.inst.in	2023-04-25 05:23:19.000000000 -0500
@@ -37,13 +37,14 @@
 	cat << EOF >> "$ISCRIPT"
 # Window Maker default X session startup script 
 
-PATH="\$PATH:$BINDIR"
+. @PREFIX@/bin/init.sh
 
 # If you login from xdm, uncomment this to make error messages appear
 # in the console window.
 #
 # tail -f "$HOME"/.xsession-errors > /dev/console &
 
+quartz-wm --only-proxy &
 exec wmaker
 
 EOF
diff -ruN wmaker-wmaker-0.95.5-orig/wmlib/Makefile.am wmaker-wmaker-0.95.5/wmlib/Makefile.am
--- wmaker-wmaker-0.95.5-orig/wmlib/Makefile.am	2013-08-29 13:36:52.000000000 -0500
+++ wmaker-wmaker-0.95.5/wmlib/Makefile.am	2023-04-25 05:34:44.000000000 -0500
@@ -8,7 +8,7 @@
 
 AM_CPPFLAGS = $(DFLAGS) @XCFLAGS@
 
-libWMaker_la_LIBADD = -lX11
+libWMaker_la_LIBADD = @XLFLAGS@ -lX11
 
 libWMaker_la_SOURCES = 	\
 	menu.c 		\