diff --git a/amiga/download.c b/amiga/download.c
index 3d3b95dea..16a50d8ff 100644
--- a/amiga/download.c
+++ b/amiga/download.c
@@ -150,7 +150,7 @@ struct gui_download_window *gui_download_window_create(download_context *ctx,
            	WA_DragBar, TRUE,
            	WA_CloseGadget, FALSE,
            	WA_SizeGadget, TRUE,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			WINDOW_SharedPort,sport,
 			WINDOW_UserData,dw,
 			WINDOW_IconifyGadget, FALSE,
diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index 55bca7e20..83025b643 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -101,7 +101,7 @@ struct ami_font_scan_window *ami_font_scan_gui_open(int32 fonts)
            	WA_DragBar, TRUE,
            	WA_CloseGadget, FALSE,
            	WA_SizeGadget, TRUE,
-			WA_CustomScreen, scrn,
+			WA_PubScreen, scrn,
 			WA_BusyPointer, TRUE,
 			WA_Width, 400,
 			WINDOW_UserData, fsw,
diff --git a/amiga/gui.c b/amiga/gui.c
index 9820a036b..d2597282c 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -3308,7 +3308,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 			WA_Left,curx,
 			WA_Width,curw,
 			WA_Height,curh,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			WA_ReportMouse,TRUE,
 			refresh_mode, TRUE,
 			WA_SizeBBottom, TRUE,
@@ -3509,7 +3509,7 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
 			WA_Width, scrn->Width,
 			WA_Height, scrn->Height,
            	WA_SizeGadget, FALSE,
-			WA_CustomScreen, scrn,
+			WA_PubScreen, scrn,
 			WA_ReportMouse, TRUE,
 			refresh_mode, TRUE,
        	   	WA_IDCMP, IDCMP_MENUPICK | IDCMP_MOUSEMOVE |
diff --git a/amiga/gui_options.c b/amiga/gui_options.c
index bfee47985..96ac2e416 100755
--- a/amiga/gui_options.c
+++ b/amiga/gui_options.c
@@ -522,7 +522,7 @@ void ami_gui_opts_open(void)
 			WA_DragBar, TRUE,
 			WA_CloseGadget, TRUE,
 			WA_SizeGadget, FALSE,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			WINDOW_SharedPort,sport,
 			WINDOW_UserData,gow,
 			WINDOW_IconifyGadget, FALSE,
diff --git a/amiga/history_local.c b/amiga/history_local.c
index 465d77ef7..a0d37b0b2 100755
--- a/amiga/history_local.c
+++ b/amiga/history_local.c
@@ -100,7 +100,7 @@ void ami_history_open(struct browser_window *bw, struct history *history)
 			WA_DragBar, TRUE,
 			WA_CloseGadget, TRUE,
 			WA_SizeGadget, TRUE,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			WA_InnerWidth,width,
 			WA_InnerHeight,height + 10,
 			WINDOW_SharedPort,sport,
diff --git a/amiga/login.c b/amiga/login.c
index 9f9513865..e70002c81 100755
--- a/amiga/login.c
+++ b/amiga/login.c
@@ -98,7 +98,7 @@ void gui_401login_open(nsurl *url, const char *realm,
            	WA_DragBar, TRUE,
            	WA_CloseGadget, FALSE,
            	WA_SizeGadget, TRUE,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			WINDOW_SharedPort,sport,
 			WINDOW_UserData,lw,
 			WINDOW_IconifyGadget, FALSE,
diff --git a/amiga/print.c b/amiga/print.c
index 405d55b09..ec04c6229 100644
--- a/amiga/print.c
+++ b/amiga/print.c
@@ -244,7 +244,7 @@ void ami_print_ui(struct hlcache_handle *c)
            	WA_DragBar, TRUE,
            	WA_CloseGadget, TRUE,
            	WA_SizeGadget, FALSE,
-			WA_CustomScreen, scrn,
+			WA_PubScreen, scrn,
 			WINDOW_SharedPort, sport,
 			WINDOW_UserData, pw,
 			WINDOW_IconifyGadget, FALSE,
@@ -532,7 +532,7 @@ void ami_print_progress(void)
            	WA_DragBar, TRUE,
            	WA_CloseGadget, FALSE,
            	WA_SizeGadget, TRUE,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			//WINDOW_SharedPort,sport,
 			WINDOW_UserData, &ami_print_info,
 			WINDOW_IconifyGadget, FALSE,
diff --git a/amiga/search.c b/amiga/search.c
index f1fad600b..12fe582cb 100755
--- a/amiga/search.c
+++ b/amiga/search.c
@@ -109,13 +109,13 @@ void ami_search_open(struct gui_window *gwin)
 
 	fwin->objects[OID_MAIN] = WindowObject,
       	WA_ScreenTitle,nsscreentitle,
-           	WA_Title,messages_get("FindTextNS"),
-           	WA_Activate, TRUE,
-           	WA_DepthGadget, TRUE,
-           	WA_DragBar, TRUE,
-           	WA_CloseGadget, TRUE,
-           	WA_SizeGadget, TRUE,
-		WA_CustomScreen,scrn,
+       	WA_Title,messages_get("FindTextNS"),
+       	WA_Activate, TRUE,
+       	WA_DepthGadget, TRUE,
+       	WA_DragBar, TRUE,
+       	WA_CloseGadget, TRUE,
+       	WA_SizeGadget, TRUE,
+		WA_PubScreen,scrn,
 		WINDOW_SharedPort,sport,
 		WINDOW_UserData,fwin,
 		WINDOW_IconifyGadget, FALSE,
diff --git a/amiga/stringview/stringview.c b/amiga/stringview/stringview.c
index 5aea939d5..e1e8073a0 100755
--- a/amiga/stringview/stringview.c
+++ b/amiga/stringview/stringview.c
@@ -69,7 +69,7 @@ struct Gadget *gad;
 	gad = (struct Gadget *)obj;
 
 	SetAttrs( data->WindowObject,
-		WA_CustomScreen, msg->gpi_GInfo->gi_Window->WScreen,
+		WA_PubScreen, msg->gpi_GInfo->gi_Window->WScreen,
 		WA_Left,	data->WinXPos,
 		WA_Top,		data->WinYPos,
 		WA_Width,	data->WinWidth,
diff --git a/amiga/tree.c b/amiga/tree.c
index bab8f25fc..9c7b9d66b 100644
--- a/amiga/tree.c
+++ b/amiga/tree.c
@@ -551,7 +551,7 @@ void ami_tree_open(struct treeview_window *twin,int type)
            	WA_CloseGadget, TRUE,
            	WA_SizeGadget, TRUE,
 			WA_Height, scrn->Height / 2,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			WA_ReportMouse,TRUE,
            	WA_IDCMP, IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE |
 					IDCMP_RAWKEY | IDCMP_GADGETUP | IDCMP_IDCMPUPDATE |
@@ -631,7 +631,7 @@ void ami_tree_open(struct treeview_window *twin,int type)
 			WA_Left, left,
 			WA_Width, width,
 			WA_Height, height,
-			WA_CustomScreen,scrn,
+			WA_PubScreen,scrn,
 			WA_ReportMouse,TRUE,
            	WA_IDCMP, IDCMP_MOUSEMOVE | IDCMP_MOUSEBUTTONS | IDCMP_NEWSIZE |
 					IDCMP_RAWKEY | IDCMP_GADGETUP | IDCMP_IDCMPUPDATE |