--- BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp	1999/11/01 16:24:10	1.5
+++ BasiliskII/src/AmigaOS/prefs_editor_amiga.cpp	2000/08/20 14:08:42	1.11
@@ -27,6 +27,7 @@
 #include <libraries/asl.h>
 #include <libraries/gtlayout.h>
 #include <libraries/Picasso96.h>
+#include <cybergraphx/cybergraphics.h>	// jl
 #include <graphics/displayinfo.h>
 #include <devices/ahi.h>
 #include <proto/exec.h>
@@ -37,6 +38,7 @@
 #include <proto/graphics.h>
 #include <proto/asl.h>
 #include <proto/Picasso96.h>
+#include <proto/cybergraphics.h>	// jl
 #include <proto/ahi.h>
 
 #include "sysdeps.h"
@@ -426,10 +428,30 @@ bool PrefsEditor(void)
 						case GAD_SCSI6_DEVICE:
 						case GAD_SERIALA_DEVICE:
 						case GAD_SERIALB_DEVICE:
+							if (dev_request) {
+								LT_LockWindow(win);
+								BOOL result = AslRequestTags(dev_request,
+									ASLFR_Window, (ULONG)win, 
+									ASLFR_InitialDrawer, (ULONG) "Devs:",
+									TAG_END);
+								LT_UnlockWindow(win);
+								if (result) {
+									char *str;
+									GT_GetGadgetAttrs(gad, win, NULL, GTST_String, (ULONG)&str, TAG_END);
+									strncpy(str, dev_request->rf_File, 255);	// Don't copy the directory part. This is usually "DEVS:" and we don't need that.
+									str[255] = 0;
+									LT_SetAttributes(h, gad->GadgetID, GTST_String, (ULONG)str, TAG_END);
+								}
+							}
+							break;
+
 						case GAD_ETHER_DEVICE:
 							if (dev_request) {
 								LT_LockWindow(win);
-								BOOL result = AslRequestTags(dev_request, ASLFR_Window, (ULONG)win, TAG_END);
+								BOOL result = AslRequestTags(dev_request,
+									ASLFR_Window, (ULONG)win, 
+									ASLFR_InitialDrawer, (ULONG) "Devs:Networks",
+									TAG_END);
 								LT_UnlockWindow(win);
 								if (result) {
 									char *str;
@@ -511,6 +533,9 @@ quit:
 	FreeAslRequest(dev_request);
 	FreeAslRequest(file_request);
 
+	// Delete Menus jl
+	LT_DisposeMenu(menu);
+
 	// Delete handle
 	LT_DeleteHandle(h);
 
@@ -871,9 +896,6 @@ do_req:						if (req) {
 		}
 	} while (!done);
 
-	// Delete handle
-	LT_DeleteHandle(h);
-
 	// Update preferences and list view
 	if (ok_clicked) {
 		char str[256];
@@ -911,6 +933,9 @@ do_req:						if (req) {
 		LT_SetAttributes(h2, GAD_DISK_LIST, GTLV_Labels, (ULONG)&disk_list, TAG_END);
 		ghost_volumes_gadgets(h2);
 	}
+
+	// Delete handle
+	LT_DeleteHandle(h);
 }
 
 // Remove volume from list
@@ -1239,15 +1264,31 @@ static void ghost_graphics_gadgets(struc
 // Show screen mode requester
 static void screen_mode_req(struct Window *win, struct LayoutHandle *h)
 {
-	if (P96Base == NULL)
+	if (P96Base == NULL && CyberGfxBase == NULL)
 		return;
 
 	LT_LockWindow(win);
-	ULONG id = p96RequestModeIDTags(
-		P96MA_MinDepth, 8,
-		P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
-		TAG_END
-	);
+
+	ULONG id;
+
+	if (CyberGfxBase)
+		{
+		UWORD ModelArray[] = { PIXFMT_LUT8, PIXFMT_RGB15, PIXFMT_ARGB32, 0, ~0 };
+
+		id = (ULONG) CModeRequestTags(NULL,
+			CYBRMREQ_MinDepth, 8,
+			CYBRMREQ_CModelArray, (ULONG) ModelArray,
+			TAG_END
+			);
+		}
+	else
+		{
+		id = p96RequestModeIDTags(
+			P96MA_MinDepth, 8,
+			P96MA_FormatsAllowed, RGBFF_CLUT | RGBFF_R5G5B5 | RGBFF_A8R8G8B8,
+			TAG_END
+		);
+		}
 	LT_UnlockWindow(win);
 
 	if (id != INVALID_ID) {
@@ -1429,7 +1470,29 @@ static void parse_serial_prefs(void)
 
 	const char *str = PrefsFindString("ether");
 	if (str)
-		sscanf(str, "%[^/]/%ld", ether_dev, &ether_unit);
+		{
+		const char *FirstSlash = strchr(str, '/');
+		const char *LastSlash = strrchr(str, '/');
+
+		if (FirstSlash && FirstSlash && FirstSlash != LastSlash)
+			{
+			// Device name contains path, i.e. "Networks/xyzzy.device"
+			const char *lp = str;
+			char *dp = ether_dev;
+
+			while (lp != LastSlash)
+				*dp++ = *lp++;
+			*dp = '\0';
+
+			sscanf(LastSlash, "/%ld", &ether_unit);
+
+//			printf("dev=<%s> unit=%d\n", ether_dev, ether_unit);
+			}
+		else
+			{
+			sscanf(str, "%[^/]/%ld", ether_dev, &ether_unit);
+			}
+		}
 }
 
 // Set serial preference item
@@ -1451,6 +1514,7 @@ static void read_serial_settings(void)
 
 	if (strlen(ether_dev)) {
 		char str[256];
+
 		sprintf(str, "%s/%ld", ether_dev, ether_unit);
 		PrefsReplaceString("ether", str);
 	} else