--- xmil/win9x/menu.cpp	2004/08/02 13:38:46	1.2
+++ xmil/win9x/menu.cpp	2004/08/08 06:59:22	1.7
@@ -7,8 +7,8 @@
 #include	"pccore.h"
 #include	"ini.h"
 #include	"menu.h"
-#include	"draw.h"
 #include	"palettes.h"
+#include	"makescrn.h"
 #include	"fdd_mtr.h"
 #include	"fdd_ini.h"
 
@@ -129,32 +129,32 @@ void xmenu_setbootmedia(UINT8 value) {
 	HMENU	hmenu;
 
 	hmenu = GetMenu(hWndMain);
-	value &= DIP_BOOTMEDIA;
-	xmilcfg.DIP_SW &= (~DIP_BOOTMEDIA);
+	value &= DIPSW_BOOTMEDIA;
+	xmilcfg.DIP_SW &= ~DIPSW_BOOTMEDIA;
 	xmilcfg.DIP_SW |= value;
 	CheckMenuItem(hmenu, IDM_BOOT2D, MFCHECK(!value));
 	CheckMenuItem(hmenu, IDM_BOOT2HD, MFCHECK(value));
 }
 
-void xmenu_setwidth(UINT8 value) {
+void xmenu_setresolute(UINT8 value) {
 
 	HMENU	hmenu;
 
 	hmenu = GetMenu(hWndMain);
-	CheckMenuItem(hmenu, IDM_WIDTH80, MFCHECK(!value));
-	CheckMenuItem(hmenu, IDM_WIDTH40, MFCHECK(value));
+	value &= DIPSW_RESOLUTE;
+	xmilcfg.DIP_SW &= ~DIPSW_RESOLUTE;
+	xmilcfg.DIP_SW |= value;
+	CheckMenuItem(hmenu, IDM_HIGHRES, MFCHECK(!value));
+	CheckMenuItem(hmenu, IDM_LOWRES, MFCHECK(value));
 }
 
-void xmenu_setresolute(UINT8 value) {
+void xmenu_setwidth(UINT8 value) {
 
 	HMENU	hmenu;
 
 	hmenu = GetMenu(hWndMain);
-	value &= DIP_RESOLUTE;
-	xmilcfg.DIP_SW &= (~DIP_RESOLUTE);
-	xmilcfg.DIP_SW |= value;
-	CheckMenuItem(hmenu, IDM_HIGHRES, MFCHECK(!value));
-	CheckMenuItem(hmenu, IDM_LOWRES, MFCHECK(value));
+	CheckMenuItem(hmenu, IDM_WIDTH80, MFCHECK(!value));
+	CheckMenuItem(hmenu, IDM_WIDTH40, MFCHECK(value));
 }
 
 void xmenu_setdispmode(UINT8 value) {
@@ -167,7 +167,7 @@ void xmenu_setdispmode(UINT8 value) {
 void xmenu_setwaitflg(UINT8 value) {
 
 	value &= 1;
-	xmilcfg.NOWAIT = value;
+	xmiloscfg.NOWAIT = value;
 	CheckMenuItem(GetMenu(hWndMain), IDM_NOWAIT, MFCHECK(value));
 }
 
@@ -176,8 +176,8 @@ void xmenu_setframe(UINT8 value) {
 	HMENU	hmenu;
 
 	hmenu = GetMenu(hWndMain);
-	xmilcfg.DRAW_SKIP = value;
-	CheckMenuItem(hmenu, IDM_RASTER, MFCHECK(!value));
+	xmiloscfg.DRAW_SKIP = value;
+	CheckMenuItem(hmenu, IDM_AUTOFPS, MFCHECK(!value));
 	CheckMenuItem(hmenu, IDM_60FPS, MFCHECK(value == 1));
 	CheckMenuItem(hmenu, IDM_30FPS, MFCHECK(value == 2));
 	CheckMenuItem(hmenu, IDM_20FPS, MFCHECK(value == 3));
@@ -260,22 +260,25 @@ void xmenu_setdispclk(UINT8 value) {
 
 void xmenu_setskipline(UINT8 value) {
 
-	xmilcfg.SKIP_LINE = value & 1;
-	CheckMenuItem(GetMenu(hWndMain), IDM_SKIPLINE, MFCHECK(xmilcfg.SKIP_LINE));
-	reflesh_palette();
-	palandply = 1;
+	value &= 1;
+	xmilcfg.SKIP_LINE = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_SKIPLINE, MFCHECK(value));
+	pal_reset();
+	makescrn.palandply = 1;
 }
 
 void xmenu_setbtnmode(UINT8 value) {
 
-	xmilcfg.BTN_MODE = value & 1;
-	CheckMenuItem(GetMenu(hWndMain), IDM_JOYX, MFCHECK(xmilcfg.BTN_MODE));
+	value &= 1;
+	xmilcfg.BTN_MODE = value;
+	CheckMenuItem(GetMenu(hWndMain), IDM_JOYX, MFCHECK(value));
 }
 
 void xmenu_setbtnrapid(UINT8 value) {
 
+	value &= 1;
 	xmilcfg.BTN_RAPID = value;
-	CheckMenuItem(GetMenu(hWndMain), IDM_RAPID, MFCHECK(xmilcfg.BTN_RAPID));
+	CheckMenuItem(GetMenu(hWndMain), IDM_RAPID, MFCHECK(value));
 }
 
 void xmenu_setz80save(UINT8 value) {