From: Toni Wilen <twilen@winuae.net>
Date: Mon, 8 Jun 2015 14:05:47 +0000 (+0300)
Subject: 3100
X-Git-Tag: 3100
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=0bcb31ed9a1d516ca48d48c589f65af542bca3ff;p=francis%2Fwinuae.git

3100
---

diff --git a/custom.cpp b/custom.cpp
index 79c8d392..43fc75e1 100644
--- a/custom.cpp
+++ b/custom.cpp
@@ -205,6 +205,7 @@ static int ciavsyncmode;
 static int diw_hstrt, diw_hstop;
 static int diw_hcounter;
 static uae_u16 refptr;
+static uae_u32 refptr_val;
 
 #define HSYNCTIME (maxhpos * CYCLE_UNIT)
 
@@ -1282,7 +1283,7 @@ STATIC_INLINE void maybe_first_bpl1dat (int hpos)
 		thisline_decision.plfleft = hpos;
 }
 
-static uae_s16 fetch_warn (int nr, int hpos)
+static int fetch_warn (int nr, int hpos)
 {
 	static int warned1 = 30, warned2 = 30;
 	int add = fetchmode_bytes;
@@ -1291,13 +1292,13 @@ static uae_s16 fetch_warn (int nr, int hpos)
 			write_log (_T("WARNING: BPL fetch conflicts with strobe refresh slot!\n"));
 			warned1--;
 		}
-		add = refptr & ~(0x0101);
+		add = refptr_val;
 	} else {
 		if (warned2 >= 0) {
 			warned2--;
 			write_log (_T("WARNING: BPL fetch at hpos 0x%02X!\n"), hpos);
 		}
-		add = refptr & ~(0x0101);
+		add = refptr_val;
 	}
 	bitplane_line_crossing = hpos;
 #if 0
@@ -1310,7 +1311,7 @@ static uae_s16 fetch_warn (int nr, int hpos)
 		bplpt[i] = (bplpt[i] & 0xffff0000) | v;
 	}
 #endif
-	return (uae_s16)add;
+	return add;
 }
 
 static void fetch (int nr, int fm, int hpos)
@@ -4592,7 +4593,41 @@ static uae_u16 VHPOSR (void)
 
 static void REFPTR(uae_u16 v)
 {
+	/*
+	 ECS Agnus:
+
+	 b15 8000: R 040
+	 b14 4000: R 020
+	 b13 2000: R 010
+	 b12 1000: R 008
+	 b11 0800: R 004 
+	 b10 0400: R 002
+	 b09 0200: R 001
+	 b08 0100: C 080
+	 b07 0080: C 040
+	 b06 0040: C 020
+	 b05 0020: C 010
+	 b04 0010: C 008
+	 b03 0008: C 004
+	 b02 0004: C 002 C 100
+	 b01 0002: C 001 R 100
+	 b00 0001: R 080
+
+	*/
+
 	refptr = v;
+	refptr_val = (v & 0xfe00) | ((v & 0x01fe) >> 1);
+	if (v & 1) {
+		v |= 0x80 << 9;
+	}
+	if (v & 2) {
+		refptr_val |= 1;
+		refptr_val |= 0x100 << 9;
+	}
+	if (v & 4) {
+		refptr_val |= 2;
+		refptr_val |= 0x100;
+	}
 }
 
 static int test_copper_dangerous (unsigned int address)
@@ -7759,6 +7794,7 @@ static void hsync_handler_pre (bool onvsync)
 	hsync_counter++;
 
 	refptr += 0x0200 * 4;
+	refptr_val += 0x0200 * 4;
 
 	if (islinetoggle ())
 		lol ^= 1;
diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi
deleted file mode 100644
index fbaa58fe..00000000
--- a/od-win32/WinUAE_Install.nsi
+++ /dev/null
@@ -1,309 +0,0 @@
-!define PRODUCT_NAME "WinUAE"
-!define PRODUCT_VERSION "2.6.1"
-!define PRODUCT_PUBLISHER "Arabuusimiehet"
-!define PRODUCT_WEB_SITE "http://www.winuae.net/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\winuae.exe"
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"
-
-;-- Your path here
-!define DISTPATH "c:\projects\winuae\distribution"
-
-SetCompressor /solid lzma
-RequestExecutionLevel admin
-
-!include "StrFunc.nsh"
-!include "WinMessages.nsh"
-
-; MUI begins ---
-!include "MUI2.nsh"
-; MUI Settings
-!define MUI_ABORTWARNING
-!define MUI_COMPONENTSPAGE_SMALLDESC
-;!define MUI_FINISHPAGE_NOAUTOCLOSE
-!define MUI_FINISHPAGE_RUN_NOTCHECKED
-!define MUI_ICON "graphics\installer_icon.ico"
-!define MUI_UNICON "graphics\installer_icon.ico"
-; MUI Bitmaps
-!define MUI_HEADERIMAGE
-!define MUI_HEADERIMAGE_BITMAP "graphics\amiga_header.bmp"
-!define MUI_WELCOMEFINISHPAGE_BITMAP "graphics\amiga_welcome.bmp"
-; Welcome page
-!insertmacro MUI_PAGE_WELCOME
-; Components page
-!insertmacro MUI_PAGE_COMPONENTS
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
-; Instfiles page
-!insertmacro MUI_PAGE_INSTFILES
-; Finish page
-!define MUI_FINISHPAGE_RUN "$INSTDIR\winuae.exe"
-!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\Docs\Readme.txt"
-!insertmacro MUI_PAGE_FINISH
-; Uninstaller pages
-!insertmacro MUI_UNPAGE_INSTFILES
-; Language files
-!insertmacro MUI_LANGUAGE "English"
-; MUI end ---
-
-Function .onInit
-  ;Find WinUAE Properties Window and close it when it's open
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "WinUAE Instantiated") i .r1 ?e'
-  Pop $1
-  StrCmp $1 183 0 Continue
-  MessageBox MB_OK|MB_ICONEXCLAMATION "WinUAE is still running in the background, the installer will terminate it.$\nYou can do this by yourself as well before proceeding with the installation."
-  FindWindow $2 "" "WinUAE Properties"
-  FindWindow $3 "" "WinUAE"
-  SendMessage $2 ${WM_CLOSE} 0 0
-  SendMessage $3 ${WM_CLOSE} 0 0
-
- Continue:
-  ReadRegStr $0 HKCU "Software\Arabuusimiehet\WinUAE" "InstallDir"
-  StrCmp $0 "" No_WinUAE
-  ;Code if WinUAE is installed
-  StrCpy $INSTDIR $0
-  Goto +2
- No_WinUAE:
-  ;Code if WinUAE is not installed
-  StrCpy $INSTDIR "$PROGRAMFILES\WinUAE"
-FunctionEnd
-
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "InstallWinUAE.exe"
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
-ShowInstDetails show
-ShowUnInstDetails show
-
-InstType "Complete" ;1
-InstType "Basic"    ;2
-InstType "Basic with Shortcuts" ;3
-
-Section "WinUAE (required)" secWinUAE_files
-  SectionIn 1 2 3 RO
-  SetOutPath "$INSTDIR\"
-  ;SetOverwrite ifnewer
- ;-- Copy WinUAE
-  File "${DISTPATH}\winuae.exe"
-  SetOutPath "$INSTDIR\Docs"
-  File "${DISTPATH}\Docs\Readme.txt"
- ;-- Creates the necessary registry entrys
-  WriteRegStr HKCU "Software\Arabuusimiehet\WinUAE" "InstallDir" "$INSTDIR"
- ;-- force ROM rescan after install
-  DeleteRegKey HKCU "Software\Arabuusimiehet\WinUAE\DetectedROMs"
-SectionEnd
-
-Section "Host-Configurations" secExConfig
-  SectionIn 1
-  SetOutPath "$INSTDIR\Configurations\Host"
-  SetOverwrite ifnewer
- ;-- Copy Example Host Configurations
-  File "${DISTPATH}\Configurations\Host\Fullscreen (800x600).uae"
-  File "${DISTPATH}\Configurations\Host\Fullscreen PAL VSync.uae"
-  File "${DISTPATH}\Configurations\Host\FullwindowD3D.uae"
-  File "${DISTPATH}\Configurations\Host\Windowed.uae"
-SectionEnd
-
-SubSection "Additional files" secAdditionalFiles
- Section "Docs" secDocs
-  SectionIn 1
-  SetOutPath "$INSTDIR\Docs"
-  SetOverwrite ifnewer
- ;-- Copy Docs
-  File "${DISTPATH}\Docs\Whatsnew-jit"
-  File "${DISTPATH}\Docs\README.umisef"
-  File "${DISTPATH}\Docs\README.pci"
-  File "${DISTPATH}\Docs\README.JIT-tuning"
-  File "${DISTPATH}\Docs\README.compemu"
-  File "${DISTPATH}\Docs\History_old.txt"
-  File "${DISTPATH}\Docs\winuaechangelog.txt"
- ;-- Copy Docs for Windows
-  SetOutPath "$INSTDIR\Docs\Windows"
-  File "${DISTPATH}\Docs\Windows\UAEHowTo.txt"
-  File "${DISTPATH}\Docs\Windows\Translation.txt"
-  File "${DISTPATH}\Docs\Windows\AmigaProg.txt"
- SectionEnd
-
- Section "Amiga programs" secAmigaprograms
-  SectionIn 1
-  SetOutPath "$INSTDIR\Amiga Programs"
-  SetOverwrite ifnewer
- ;-- Copy the Amiga Programs
-  File "${DISTPATH}\Amiga Programs\winxpprinthelper.info"
-  File "${DISTPATH}\Amiga Programs\winxpprinthelper"
-  File "${DISTPATH}\Amiga Programs\winuaeenforcer.txt"
-  File "${DISTPATH}\Amiga Programs\winuaeenforcer"
-  File "${DISTPATH}\Amiga Programs\winuaeclip.txt"
-  File "${DISTPATH}\Amiga Programs\winuaeclip.info"
-  File "${DISTPATH}\Amiga Programs\winuaeclip"
-  File "${DISTPATH}\Amiga Programs\uaectrl"
-  File "${DISTPATH}\Amiga Programs\uae-control.info"
-  File "${DISTPATH}\Amiga Programs\uae-control"
-  File "${DISTPATH}\Amiga Programs\uae-configuration"
-  File "${DISTPATH}\Amiga Programs\uae_rcli"
-  File "${DISTPATH}\Amiga Programs\UAE_German.info"
-  File "${DISTPATH}\Amiga Programs\UAE_German"
-  File "${DISTPATH}\Amiga Programs\transrom"
-  File "${DISTPATH}\Amiga Programs\transdisk"
-  File "${DISTPATH}\Amiga Programs\timehack"
-  File "${DISTPATH}\Amiga Programs\rtg.library"
-  File "${DISTPATH}\Amiga Programs\p96refresh"
-  File "${DISTPATH}\Amiga Programs\german_KeyMap_new.zip"
-  File "${DISTPATH}\Amiga Programs\amigaprog.txt"
-  File "${DISTPATH}\Amiga Programs\ahidriver.zip"
-  File "${DISTPATH}\Amiga Programs\sources.zip"
- SectionEnd
-SubSectionEnd
-
-;SubSection "Translations" secTranslations
-; Section "German" secTransGerman
-;  SectionIn 1
-;  SetOutPath "$INSTDIR\"
-;  File "${DISTPATH}\WinUAE_German.dll"
-; SectionEnd
- 
-; Section "Foo" secTransFoo
-;  SectionIn 1
-;  SetOutPath "$INSTDIR\"
-;  File "${DISTPATH}\WinUAE_Foo.dll"
-; SectionEnd
-;SubSectionEnd
-
-SubSection "Shortcuts" secShortcuts
- Section "Startmenu" secStartmenu
-  SectionIn 1 3
-  CreateDirectory "$SMPROGRAMS\WinUAE"
-  CreateShortCut "$SMPROGRAMS\WinUAE\WinUAE.lnk" "$INSTDIR\winuae.exe"
-  CreateShortCut "$SMPROGRAMS\WinUAE\ReadMe.lnk" "$INSTDIR\Docs\Readme.txt"
-  CreateShortCut "$SMPROGRAMS\WinUAE\Uninstall.lnk" "$INSTDIR\uninstall_winuae.exe"
- SectionEnd
-
- Section "Desktop" secDesktop
-  SectionIn 1 3
-  CreateShortCut "$DESKTOP\WinUAE.lnk" "$INSTDIR\winuae.exe"
- SectionEnd
-
- Section "Quick Launch" secQuickLaunch
-  SectionIn 1 3
-  CreateShortcut "$QUICKLAUNCH\WinUAE.lnk" "$INSTDIR\winuae.exe"
- SectionEnd
-SubSectionend
-
-Section -Post
-  WriteUninstaller "$INSTDIR\uninstall_winuae.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\winuae.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninstall_winuae.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\winuae.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
-SectionEnd
-
-; Section descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${secWinUAE_files} "WinUAE (WinUAE.exe, readme.txt)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secExConfig} "Example Host-Configurations"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secAdditionalFiles} "Additional files (Docs, Amiga programs)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secAmigaprograms} "Amiga programs"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secDocs} "Documentation"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secShortcuts} "Shortcuts (Startmenu, Desktop, Quick Launch)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secStartmenu} "Create a startmenu entry"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secDesktop} "Create a desktop icon"
-  !insertmacro MUI_DESCRIPTION_TEXT ${secQuickLaunch} "Create a Quick Launch icon"
-;  !insertmacro MUI_DESCRIPTION_TEXT ${secTranslations} "WinUAE Translations"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-
-Function un.onUninstSuccess
-  HideWindow
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
-FunctionEnd
-
-Function un.onInit
-  MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
-  Abort
-FunctionEnd
-
-Section Uninstall
-  Delete "$INSTDIR\uninstall_winuae.exe"
-  Delete "$INSTDIR\Docs\Windows\AmigaProg.txt"
-  Delete "$INSTDIR\Docs\Windows\Translation.txt"
-  Delete "$INSTDIR\Docs\Windows\UAEHowTo.txt"
-  Delete "$INSTDIR\Docs\History_old.txt"
-  Delete "$INSTDIR\Docs\README.compemu"
-  Delete "$INSTDIR\Docs\README.JIT-tuning"
-  Delete "$INSTDIR\Docs\README.pci"
-  Delete "$INSTDIR\Docs\Readme.txt"
-  Delete "$INSTDIR\Docs\Readme.txt.bak"
-  Delete "$INSTDIR\Docs\README.umisef"
-  Delete "$INSTDIR\Docs\Whatsnew-jit"
-  Delete "$INSTDIR\Docs\winuaechangelog.txt"
-  Delete "$INSTDIR\Amiga Programs\ahidriver.zip"
-  Delete "$INSTDIR\Amiga Programs\amigaprog.txt"
-  Delete "$INSTDIR\Amiga Programs\german_KeyMap_new.zip"
-  Delete "$INSTDIR\Amiga Programs\mousehack"
-  Delete "$INSTDIR\Amiga Programs\p96_uae_tweak"
-  Delete "$INSTDIR\Amiga Programs\p96refresh"
-  Delete "$INSTDIR\Amiga Programs\picasso96fix"
-  Delete "$INSTDIR\Amiga Programs\rtg.library"
-  Delete "$INSTDIR\Amiga Programs\timehack"
-  Delete "$INSTDIR\Amiga Programs\transdisk"
-  Delete "$INSTDIR\Amiga Programs\transrom"
-  Delete "$INSTDIR\Amiga Programs\UAE_German"
-  Delete "$INSTDIR\Amiga Programs\UAE_German.info"
-  Delete "$INSTDIR\Amiga Programs\uae_rcli"
-  Delete "$INSTDIR\Amiga Programs\uae-configuration"
-  Delete "$INSTDIR\Amiga Programs\uae-control"
-  Delete "$INSTDIR\Amiga Programs\uae-control.info"
-  Delete "$INSTDIR\Amiga Programs\uaectrl"
-  Delete "$INSTDIR\Amiga Programs\winuaeclip"
-  Delete "$INSTDIR\Amiga Programs\winuaeclip.info"
-  Delete "$INSTDIR\Amiga Programs\winuaeclip.txt"
-  Delete "$INSTDIR\Amiga Programs\winuaeenforcer"
-  Delete "$INSTDIR\Amiga Programs\winuaeenforcer.txt"
-  Delete "$INSTDIR\Amiga Programs\winxpprinthelper"
-  Delete "$INSTDIR\Amiga Programs\winxpprinthelper.info"
-  Delete "$INSTDIR\Amiga Programs\sources\p96refresh.ab2"
-  Delete "$INSTDIR\Amiga Programs\sources\uae-configuration.s"
-  Delete "$INSTDIR\Amiga Programs\sources\uae-configuration.c"
-  Delete "$INSTDIR\Amiga Programs\sources\picasso96fix.lha"
-  Delete "$INSTDIR\Amiga Programs\sources.zip"
-  Delete "$INSTDIR\Configurations\Host\Fullscreen (800x600).uae"
-  Delete "$INSTDIR\Configurations\Host\Fullscreen PAL VSync.uae"
-  Delete "$INSTDIR\Configurations\Host\FullwindowD3D.uae"
-  Delete "$INSTDIR\Configurations\Host\Windowed.uae"
-  Delete "$INSTDIR\winuaebootlog.txt"
-  Delete "$INSTDIR\winuaelog.txt"
-  Delete "$INSTDIR\winuae.exe"
-  Delete "$INSTDIR\zlib1.dll"
-  Delete "$INSTDIR\WinUAE_German.dll"
-
-  Delete "$SMPROGRAMS\WinUAE\Uninstall.lnk"
-  Delete "$SMPROGRAMS\WinUAE\WinUAE.lnk"
-  Delete "$SMPROGRAMS\WinUAE\ReadMe.lnk"
-  Delete "$DESKTOP\WinUAE.lnk"
-  Delete "$QUICKLAUNCH\WinUAE.lnk"
-
-  RMDir "$INSTDIR\Docs\Windows"
-  RMDir "$INSTDIR\Docs"
-  RMDir "$INSTDIR\Amiga Programs"
-  RMDir "$INSTDIR\Configurations\Host"
-  RMDir "$INSTDIR\Configurations\Hardware"
-  RMDir "$INSTDIR\Configurations"
-  RMDir "$INSTDIR\Roms"
-  RMDir "$INSTDIR\SaveImages"
-  RMDir "$INSTDIR\SaveStates"
-  RMDir "$INSTDIR\ScreenShots"
-  RMDir "$INSTDIR\InputRecordings"
-  RMDir "$INSTDIR\plugins\codecs"
-  RMDir "$INSTDIR\plugins"
-
-  RMDir "$SMPROGRAMS\WinUAE"
-  RMDir "$INSTDIR\"
-  RMDir ""
-
-  DeleteRegKey HKCU "Software\Arabuusimiehet"
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
-  SetAutoClose true
-SectionEnd
diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
index f5a0163b..c3dce642 100644
--- a/od-win32/resources/winuae_minimal.rc
+++ b/od-win32/resources/winuae_minimal.rc
@@ -76,39 +76,47 @@ END
 // Dialog
 //
 
-IDD_KICKSTART DIALOGEX 0, 0, 396, 279
+IDD_KICKSTART DIALOGEX 0, 0, 396, 304
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTEXTHELP
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "System ROM Settings",IDC_STATIC,1,0,394,93
+    GROUPBOX        "System ROM Settings",IDC_STATIC,1,0,394,91
     LTEXT           "Main ROM file:",IDC_ROMTEXT,14,13,263,10
-    COMBOBOX        IDC_ROMFILE,12,26,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_ROMFILE,12,25,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_KICKCHOOSER,376,25,10,15
-    LTEXT           "Extended ROM file:",IDC_ROMFILE2TEXT,14,43,263,10
-    COMBOBOX        IDC_ROMFILE2,12,56,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Extended ROM file:",IDC_ROMFILE2TEXT,14,42,263,10
+    COMBOBOX        IDC_ROMFILE2,12,54,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_ROMCHOOSER2,376,55,10,15
     CONTROL         "MapROM emulation [] Creates a BlizKick-compatible memory area.",IDC_MAPROM,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,77,104,12
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,87,73,104,12
     CONTROL         "ShapeShifter support [] Patches the system ROM for ShapeShifter compatibility.",IDC_KICKSHIFTER,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,77,106,13
-    GROUPBOX        "Miscellaneous",IDC_STATIC,1,98,394,177
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,195,73,106,13
+    GROUPBOX        "Miscellaneous",IDC_STATIC,0,96,395,106
     LTEXT           "Cartridge ROM file:",IDC_FLASHTEXT2,12,112,265,10
-    COMBOBOX        IDC_CARTFILE,12,125,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_CARTCHOOSER,376,124,10,15
-    LTEXT           "Flash RAM file:",IDC_FLASHTEXT,12,144,265,10
-    EDITTEXT        IDC_FLASHFILE,12,157,361,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_FLASHCHOOSER,376,156,10,15
-    LTEXT           "Real Time Clock file",IDC_STATIC,12,174,313,15,SS_CENTERIMAGE
-    EDITTEXT        IDC_RTCFILE,12,191,361,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "...",IDC_RTCCHOOSER,376,189,10,15
-    COMBOBOX        IDC_SCSIROMSELECT,12,223,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "SCSI ROM file:",IDC_STATIC,12,207,170,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_SCSIROMFILE,202,223,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_SCSIROMCHOOSER,376,221,10,15
-    LTEXT           "Accelerator board ROM file:",IDC_STATIC,12,240,170,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_CPUBOARDROMFILE,12,256,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "...",IDC_CPUBOARDROMCHOOSER,187,255,10,15
+    COMBOBOX        IDC_CARTFILE,12,124,361,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_CARTCHOOSER,376,123,10,15
+    LTEXT           "Flash RAM file:",IDC_FLASHTEXT,12,141,265,10
+    EDITTEXT        IDC_FLASHFILE,12,153,361,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_FLASHCHOOSER,376,151,10,15
+    LTEXT           "Real Time Clock file",IDC_STATIC,12,167,313,15,SS_CENTERIMAGE
+    EDITTEXT        IDC_RTCFILE,12,183,361,12,ES_AUTOHSCROLL
+    PUSHBUTTON      "...",IDC_RTCCHOOSER,376,181,10,15
+    GROUPBOX        "Expansion ROM Settings",IDC_STATIC,1,206,394,66
+    LTEXT           "SCSI/IDE/Boot ROM file:",IDC_STATIC,12,219,170,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_SCSIROMSELECT,12,235,157,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SCSIROMSELECTNUM,175,235,22,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Autoboot disabled",IDC_SCSIROMFILEAUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,216,99,12
+    RTEXT           "Controller ID:",IDC_STATIC,294,216,57,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_SCSIROMID,356,217,29,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_SCSIROMFILE,202,235,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_SCSIROMCHOOSER,376,235,10,15
+    COMBOBOX        IDC_SCSIROMSUBSELECT,202,253,171,75,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "Accelerator board ROM file:",IDC_STATIC,12,273,170,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_CPUBOARDROMFILE,12,289,171,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "...",IDC_CPUBOARDROMCHOOSER,187,288,10,15
+    CONTROL         "-",IDC_EXPANSION_SETTING1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,11,256,77,10
+    CONTROL         "-",IDC_EXPANSION_SETTING2,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,116,256,77,10
 END
 
 IDD_DISPLAY DIALOGEX 0, 0, 396, 298
@@ -138,6 +146,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,140,123,10
     CONTROL         "Remove interlace artifacts [] Emulates interlace mode internally as progressive, removing all interlace artifacts. Not compatible with all software.",IDC_FLICKERFIXER,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,154,139,10
+    CONTROL         "VGA mode resolution autoswitch [] Automatically selects between hires and superhires in programmed display modes, keeping correct aspect ratio.",IDC_AUTORESOLUTIONVGA,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,154,124,10
     RTEXT           "Resolution:",IDC_STATIC,24,170,110,8,SS_CENTERIMAGE
     COMBOBOX        IDC_LORES,142,169,127,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Resolution autoswitch:",IDC_STATIC,92,190,110,8,SS_CENTERIMAGE
@@ -167,11 +177,9 @@ BEGIN
     CONTROL         "Double, frames",IDC_LM_IDOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,251,90,10
     CONTROL         "Double, fields",IDC_LM_IDOUBLED2,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,264,90,10
     CONTROL         "Double, fields+",IDC_LM_IDOUBLED3,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,299,277,90,10
-    CONTROL         "VGA mode resolution autoswitch [] Automatically selects between hires and superhires in programmed display modes, keeping correct aspect ratio.",IDC_AUTORESOLUTIONVGA,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,155,154,124,10
 END
 
-IDD_MEMORY DIALOGEX 0, 0, 396, 290
+IDD_MEMORY DIALOGEX 0, 0, 396, 304
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTEXTHELP
 FONT 8, "MS Sans Serif", 0, 0, 0x1
@@ -183,7 +191,6 @@ BEGIN
     RTEXT           "Z2 Fast:",IDC_STATIC,8,49,60,15,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_FASTMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,68,47,60,20
     EDITTEXT        IDC_FASTRAM,135,53,40,12,ES_CENTER | ES_READONLY
-    CONTROL         "Autoconfig Z2 Fast RAM",IDC_FASTMEMAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,45,220,120,10
     RTEXT           "Slow:",IDC_STATIC,179,25,66,15,SS_CENTERIMAGE
     CONTROL         "Slider1",IDC_SLOWMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,248,22,60,20
     EDITTEXT        IDC_SLOWRAM,311,25,40,12,ES_CENTER | ES_READONLY
@@ -194,22 +201,26 @@ BEGIN
     CONTROL         "",IDC_Z3CHIPMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,248,71,60,20
     EDITTEXT        IDC_Z3CHIPRAM,311,76,40,12,ES_CENTER | ES_READONLY
     EDITTEXT        IDC_MAX32RAM,14,99,366,12,ES_CENTER | ES_READONLY
-    GROUPBOX        "Advanced Memory Settings",IDC_STATIC,0,133,393,147
+    GROUPBOX        "Advanced Memory Settings",IDC_STATIC,0,133,393,164
     RTEXT           "Motherboard Fast:",IDC_STATIC,116,149,129,10,SS_CENTERIMAGE
     CONTROL         "",IDC_MBMEM1,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,251,145,68,20
     EDITTEXT        IDC_MBRAM1,326,148,40,12,ES_CENTER | ES_READONLY
     RTEXT           "Processor Slot Fast:",IDC_STATIC,116,172,129,10,SS_CENTERIMAGE
     CONTROL         "",IDC_MBMEM2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,251,168,68,20
     EDITTEXT        IDC_MBRAM2,326,171,40,12,ES_CENTER | ES_READONLY
+    RTEXT           "Second Z2 Fast RAM board:",IDC_STATIC,129,194,116,15,SS_CENTERIMAGE
     CONTROL         "",IDC_FASTMEM2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,251,193,68,20
     EDITTEXT        IDC_FASTRAM2,326,196,40,12,ES_CENTER | ES_READONLY
-    COMBOBOX        IDC_CPUBOARD_TYPE,8,257,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Second Z2 Fast RAM board:",IDC_STATIC,129,194,116,15,SS_CENTERIMAGE
-    RTEXT           "Accelerator board memory:",IDC_STATIC,138,257,104,15,SS_CENTERIMAGE
-    CONTROL         "",IDC_CPUBOARDMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,251,253,68,20
-    EDITTEXT        IDC_CPUBOARDRAM,326,256,40,12,ES_CENTER | ES_READONLY
-    COMBOBOX        IDC_Z3MAPPING,249,220,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Z3 mapping mode:",IDC_STATIC,149,220,93,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_Z3MAPPING,249,220,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Accelerator board memory:",IDC_STATIC,138,250,104,15,SS_CENTERIMAGE
+    CONTROL         "",IDC_CPUBOARDMEM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,251,246,68,20
+    EDITTEXT        IDC_CPUBOARDRAM,326,249,40,12,ES_CENTER | ES_READONLY
+    COMBOBOX        IDC_CPUBOARD_TYPE,9,255,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_CPUBOARD_SUBTYPE,9,274,117,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "-",IDC_CPUBOARD_SETTING1,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,155,277,100,10
+    CONTROL         "-",IDC_CPUBOARD_SETTING2,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,261,277,100,10
+    CONTROL         "Autoconfig Z2 Fast RAM",IDC_FASTMEMAUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,194,120,10
 END
 
 IDD_CPU DIALOGEX 0, 0, 396, 292
@@ -360,7 +371,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,301,201,11
 END
 
-IDD_SOUND DIALOGEX 0, 0, 396, 288
+IDD_SOUND DIALOGEX 0, 0, 396, 306
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
@@ -369,14 +380,15 @@ BEGIN
     CONTROL         "Disabled",IDC_SOUND0,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,35,108,10
     CONTROL         "Disabled, but emulated",IDC_SOUND1,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,53,107,10
     CONTROL         "Enabled",IDC_SOUND2,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,13,71,108,10
-    CONTROL         "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,89,108,10
+    CONTROL         "Automatic switching",IDC_SOUND_AUTO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,92,108,10
+    CONTROL         "Include CD and FMV audio",IDC_SOUND_CDPAULAMIX,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,13,108,108,10
     GROUPBOX        "Volume",IDC_STATIC,139,19,255,69
-    RTEXT           "Paula Audio",IDC_STATIC,152,38,51,10,SS_CENTERIMAGE
-    CONTROL         "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,207,32,105,20
-    EDITTEXT        IDC_SOUNDVOLUME2,329,35,48,12,ES_CENTER | ES_READONLY
-    RTEXT           "CD Audio",IDC_STATIC,152,67,51,10,SS_CENTERIMAGE
-    CONTROL         "",IDC_SOUNDVOLUMECD,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,207,61,105,20
-    EDITTEXT        IDC_SOUNDVOLUMECD2,329,64,48,12,ES_CENTER | ES_READONLY
+    RTEXT           "Master",IDC_STATIC,160,38,51,10,SS_CENTERIMAGE
+    CONTROL         "",IDC_SOUNDVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,215,32,105,20
+    EDITTEXT        IDC_SOUNDVOLUME2,337,35,48,12,ES_CENTER | ES_READONLY
+    COMBOBOX        IDC_SOUNDVOLUMESELECT,147,65,64,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "",IDC_SOUNDVOLUMEEXT,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,215,61,105,20
+    EDITTEXT        IDC_SOUNDVOLUMEEXT2,337,64,48,12,ES_CENTER | ES_READONLY
     GROUPBOX        "Sound Buffer Size",IDC_STATIC,140,90,254,42
     CONTROL         "Slider1",IDC_SOUNDBUFFERRAM,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,207,106,105,20
     EDITTEXT        IDC_SOUNDBUFFERMEM,329,109,48,12,ES_CENTER | ES_READONLY
@@ -395,16 +407,18 @@ BEGIN
     COMBOBOX        IDC_SOUNDSTEREOMIX,181,186,74,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Audio filter:",IDC_SOUNDFILTERTXT,279,176,98,8,SS_CENTERIMAGE
     COMBOBOX        IDC_SOUNDFILTER,279,186,96,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Floppy Drive Sound Emulation",IDC_STATIC,1,213,278,73
-    CONTROL         "",IDC_SOUNDDRIVEVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,20,229,107,19
+    GROUPBOX        "Floppy Drive Sound Emulation",IDC_STATIC,1,209,278,91
+    CONTROL         "",IDC_SOUNDDRIVEVOLUME,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,20,227,107,19
     EDITTEXT        IDC_SOUNDDRIVEVOLUME2,144,231,48,12,ES_CENTER | ES_READONLY
+    CONTROL         "",IDC_SOUNDDRIVEVOLUMEX,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,20,254,107,19
+    EDITTEXT        IDC_SOUNDDRIVEVOLUMEX2,144,258,48,12,ES_CENTER | ES_READONLY
     COMBOBOX        IDC_SOUNDDRIVE,205,231,66,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_SOUNDDRIVESELECT,18,257,253,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Drivers",IDC_STATIC,285,213,109,73
-    CONTROL         "DirectSound",IDC_SOUND_DS,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,227,98,10
-    CONTROL         "WASAPI",IDC_SOUND_WASAPI,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,240,98,10
-    CONTROL         "OpenAL",IDC_SOUND_OPENAL,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,253,98,10
-    CONTROL         "PortAudio",IDC_SOUND_PORTAUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,266,98,10
+    COMBOBOX        IDC_SOUNDDRIVESELECT,18,281,253,75,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Drivers",IDC_STATIC,285,213,109,87
+    CONTROL         "DirectSound",IDC_SOUND_DS,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,234,98,10
+    CONTROL         "WASAPI",IDC_SOUND_WASAPI,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,248,98,10
+    CONTROL         "OpenAL",IDC_SOUND_OPENAL,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,262,98,10
+    CONTROL         "PortAudio",IDC_SOUND_PORTAUDIO,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,292,276,98,10
 END
 
 IDD_LOADSAVE DIALOGEX 0, 0, 396, 318
@@ -474,12 +488,12 @@ BEGIN
     COMBOBOX        IDC_PORT0_JOYS,45,19,342,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_PORT0_AF,45,37,86,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_PORT0_JOYSMODE,136,38,106,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Remap [] Remap Port 1 configurarion.",IDC_PORT0_REMAP,352,37,36,14
+    PUSHBUTTON      "Remap / Test [] Remap or test Port 1 configurarion.",IDC_PORT0_REMAP,310,37,78,14
     RTEXT           "Port 2:",IDC_STATIC,6,56,35,15,SS_CENTERIMAGE
     COMBOBOX        IDC_PORT1_JOYS,45,57,342,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_PORT1_AF,45,74,86,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_PORT1_JOYSMODE,136,74,106,130,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Remap [] Remap Port 2 configuration.",IDC_PORT1_REMAP,352,74,36,14
+    PUSHBUTTON      "Remap / Test [] Remap or test Port 2 configuration.",IDC_PORT1_REMAP,310,74,78,14
     PUSHBUTTON      "Swap ports [] Swap ports 1 and 2.",IDC_SWAP,45,100,78,14
     LTEXT           "Emulated parallel port joystick adapter",IDC_STATIC,10,124,179,15,SS_CENTERIMAGE
     RTEXT           "X-Arcade layout information []#1",IDC_STATIC,217,124,170,15,SS_NOTIFY | SS_CENTERIMAGE
@@ -498,6 +512,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,140,270,106,11
     CONTROL         "Tablet.library emulation",IDC_PORT_TABLET_LIBRARY,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,267,271,117,11
+    CONTROL         "Mouse/Joystick autoswitching [] Press button to automatically insert inactive input device in to joystick/mouse port",IDC_PORT_AUTOSWITCH,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,102,172,11
 END
 
 IDD_CONTRIBUTORS DIALOGEX 0, 0, 530, 345
@@ -551,13 +567,13 @@ BEGIN
     CTEXT           "DirectDraw:",IDC_STATIC,272,106,117,10,SS_CENTERIMAGE
     COMBOBOX        IDC_DD_SURFACETYPE,287,119,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "GUI",IDC_STATIC,266,144,128,93
-    CTEXT           "Language:",IDC_STATIC,271,154,117,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_LANGUAGE,273,168,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "GUI Font...",IDC_GUI_FONT,272,185,54,14
-    PUSHBUTTON      "List Font...",IDC_GUI_LISTFONT,333,185,54,14
-    PUSHBUTTON      "Set default",IDC_GUI_DEFAULT,272,204,54,14
-    COMBOBOX        IDC_GUI_SIZE,333,205,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,222,114,11
+    COMBOBOX        IDC_LANGUAGE,273,157,114,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "GUI Font...",IDC_GUI_FONT,272,174,54,14
+    PUSHBUTTON      "List Font...",IDC_GUI_LISTFONT,333,174,54,14
+    PUSHBUTTON      "Set default",IDC_GUI_DEFAULT,272,193,54,14
+    COMBOBOX        IDC_GUI_SIZE,333,194,54,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,211,114,11
+    CONTROL         "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,224,114,11
     GROUPBOX        "State Files",IDC_STATIC,1,242,393,38
     EDITTEXT        IDC_STATENAME,8,257,231,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
     CONTROL         "",IDC_STATECLEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,244,261,9,10
@@ -570,13 +586,13 @@ BEGIN
     CONTROL         "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,296,64,11
 END
 
-IDD_HARDFILE DIALOGEX 0, 0, 396, 263
+IDD_HARDFILE DIALOGEX 0, 0, 397, 279
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
 CAPTION "Hardfile Settings"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    GROUPBOX        "Settings",IDC_STATIC,2,2,392,164
+    GROUPBOX        "Settings",IDC_STATIC,2,2,392,183
     RTEXT           "Path:",IDC_HARDFILE_DIR_TEXT,10,18,37,10
     COMBOBOX        IDC_PATH_NAME,52,15,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_SELECTOR,380,14,11,15
@@ -584,38 +600,42 @@ BEGIN
     COMBOBOX        IDC_PATH_FILESYS,51,35,325,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "...",IDC_FILESYS_SELECTOR,380,34,11,15
     RTEXT           "Device:",IDC_HARDFILE_DEVICE_TEXT,16,58,31,10
-    EDITTEXT        IDC_HARDFILE_DEVICE,52,55,121,15,ES_AUTOHSCROLL
-    PUSHBUTTON      "Enable RDB mode",IDC_HDF_RDB,285,55,92,14
-    CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,53,74,67,10
-    CONTROL         "Bootable",IDC_HDF_AUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,136,74,67,10
-    CONTROL         "Do not mount",IDC_HDF_DONOTMOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,217,74,67,10
-    CONTROL         "Global filesystem",IDC_HDF_ADDFSRES,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,298,74,82,10
-    RTEXT           "Boot priority:",IDC_HARDFILE_BOOTPRI_TEXT,67,94,83,10
-    EDITTEXT        IDC_HARDFILE_BOOTPRI,155,90,44,15
-    RTEXT           "Surfaces:",IDC_SURFACES_TEXT,209,94,48,10
-    EDITTEXT        IDC_HEADS,262,90,40,15,ES_NUMBER
-    RTEXT           "Reserved:",IDC_RESERVED_TEXT,307,94,50,10
-    EDITTEXT        IDC_RESERVED,362,90,28,15,ES_NUMBER
-    RTEXT           "HD Controller:",IDC_STATIC,11,113,54,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_HDF_CONTROLLER,73,112,93,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    RTEXT           "Sectors:",IDC_SECTORS_TEXT,209,113,48,10
-    EDITTEXT        IDC_SECTORS,262,111,40,15,ES_NUMBER
-    RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,306,113,50,10
-    EDITTEXT        IDC_BLOCKSIZE,362,111,28,15,ES_NUMBER
-    EDITTEXT        IDC_HDFINFO,5,131,385,12,ES_CENTER | ES_READONLY
-    EDITTEXT        IDC_HDFINFO2,5,147,385,12,ES_CENTER | ES_READONLY
-    GROUPBOX        "New hard disk image file",IDC_STATIC,2,171,392,62
-    PUSHBUTTON      "Create",IDC_HF_CREATE,58,187,80,14
-    COMBOBOX        IDC_HF_TYPE,58,211,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_HF_SIZE,154,187,61,15,ES_NUMBER
-    LTEXT           "MB",IDC_STATIC,220,190,53,10,SS_CENTERIMAGE
-    EDITTEXT        IDC_HF_DOSTYPE,154,210,61,15
-    LTEXT           "DOS type",IDC_STATIC,222,212,51,10,SS_CENTERIMAGE
-    CONTROL         "Sparse file",IDC_HF_SPARSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,196,87,10
-    CONTROL         "Dynamic HDF",IDC_HF_DYNAMIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,208,87,10
-    PUSHBUTTON      "OK",IDOK,147,242,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,203,242,50,14
-    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,173,112,25,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_HARDFILE_DEVICE,52,55,89,15,ES_AUTOHSCROLL
+    RTEXT           "Boot priority:",IDC_HARDFILE_BOOTPRI_TEXT,150,57,83,10
+    EDITTEXT        IDC_HARDFILE_BOOTPRI,238,55,44,15
+    CONTROL         "Manual geometry",IDC_HDF_PHYSGEOMETRY,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,299,56,87,10
+    CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,75,67,10
+    CONTROL         "Do not mount",IDC_HDF_DONOTMOUNT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,52,89,67,10
+    CONTROL         "Bootable",IDC_HDF_AUTOBOOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,75,78,10
+    CONTROL         "Global filesystem",IDC_HDF_ADDFSRES,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,152,89,82,10
+    RTEXT           "Surfaces:",IDC_SURFACES_TEXT,298,76,45,10
+    EDITTEXT        IDC_HEADS,347,73,40,15,ES_NUMBER
+    RTEXT           "Sectors:",IDC_SECTORS_TEXT,298,95,45,10
+    EDITTEXT        IDC_SECTORS,347,92,40,15,ES_NUMBER
+    RTEXT           "Reserved:",IDC_RESERVED_TEXT,297,113,46,10
+    EDITTEXT        IDC_RESERVED,347,111,40,15,ES_NUMBER
+    RTEXT           "Block size:",IDC_BLOCKSIZE_TEXT,299,132,45,10
+    EDITTEXT        IDC_BLOCKSIZE,347,130,40,15,ES_NUMBER
+    PUSHBUTTON      "Enable RDB mode",IDC_HDF_RDB,214,109,75,14
+    LTEXT           "HD Controller:",IDC_STATIC,10,113,54,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_HDF_CONTROLLER,6,131,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,149,131,25,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_TYPE,180,131,29,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_FEATURE_LEVEL,214,131,75,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_HDFINFO,5,150,385,12,ES_CENTER | ES_READONLY
+    EDITTEXT        IDC_HDFINFO2,5,166,385,12,ES_CENTER | ES_READONLY
+    GROUPBOX        "New hard disk image file",IDC_STATIC,2,190,392,62
+    PUSHBUTTON      "Create",IDC_HF_CREATE,58,206,80,14
+    COMBOBOX        IDC_HF_TYPE,58,230,80,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_HF_SIZE,154,206,61,15,ES_NUMBER
+    LTEXT           "MB",IDC_STATIC,220,209,53,10,SS_CENTERIMAGE
+    EDITTEXT        IDC_HF_DOSTYPE,154,229,61,15
+    LTEXT           "DOS type",IDC_STATIC,222,231,51,10,SS_CENTERIMAGE
+    CONTROL         "Sparse file",IDC_HF_SPARSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,215,87,10
+    CONTROL         "Dynamic HDF",IDC_HF_DYNAMIC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,227,87,10
+    PUSHBUTTON      "OK",IDOK,147,258,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,203,258,50,14
+    RTEXT           "Cylinders:",IDC_CYLINDERS_TEXT,300,113,43,10,NOT WS_VISIBLE
 END
 
 IDD_FILESYS DIALOGEX 15, 25, 396, 111
@@ -680,8 +700,8 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,234,29,150,10
     CONTROL         "Genlock connected [] Allow boot sequence to detect genlock. Genlock is not emulated.",IDC_GENLOCK,
                     "Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,234,42,150,10
-    CTEXT           "External display hardware:",IDC_STATIC,228,59,117,15,SS_CENTERIMAGE
-    COMBOBOX        IDC_MONITOREMU,238,78,98,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CTEXT           "Video port display hardware:",IDC_STATIC,228,59,117,15,SS_CENTERIMAGE
+    COMBOBOX        IDC_MONITOREMU,238,78,147,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     GROUPBOX        "Collision Level",IDC_STATIC,1,116,393,48
     CONTROL         "None [] Collision hardware emulation disabled.",IDC_COLLISION0,
                     "Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,47,132,101,10
@@ -716,15 +736,18 @@ BEGIN
     CONTROL         "ROM Mirror (E0)",IDC_CS_KSMIRROR_E0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,157,104,11
     CONTROL         "KB Reset Warning",IDC_CS_RESETWARNING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,171,104,11
     CONTROL         "CIA TOD bug",IDC_CS_CIATODBUG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,184,104,11
+    CONTROL         "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,104,11
     CONTROL         "A1000 Boot RAM/ROM",IDC_CS_A1000RAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,102,121,11
     CONTROL         "CD32 C2P",IDC_CS_CD32C2P,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,116,121,11
     CONTROL         "CDTV SRAM",IDC_CS_CDTVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,129,121,11
     CONTROL         "A4000/A4000T IDE",IDC_CS_IDE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,143,121,11
     CONTROL         "ROM Mirror (A8)",IDC_CS_KSMIRROR_A8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,157,121,11
     CONTROL         "No-EHB Denise",IDC_CS_NOEHB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,171,121,11
+    CONTROL         "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,104,11
     CONTROL         "DF0: ID Hardware",IDC_CS_DF0IDHW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,102,125,11
     CONTROL         "CD32 NVRAM",IDC_CS_CD32NVRAM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,116,125,11
     CONTROL         "CDTV SRAM Expansion",IDC_CS_CDTVRAMEXP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,129,125,11
+    CONTROL         "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,143,123,11
     CONTROL         "PCMCIA",IDC_CS_PCMCIA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,156,125,11
     CONTROL         "C00000 is Fast RAM",IDC_CS_SLOWISFAST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,170,125,11
     CONTROL         "A1000 Agnus (8361/8367)",IDC_CS_DIPAGNUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,184,125,11
@@ -741,9 +764,6 @@ BEGIN
     CONTROL         "Denise/Lisa revision:",IDC_CS_DENISE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,200,289,107,11
     EDITTEXT        IDC_CS_AGNUSREV,311,274,45,13,ES_AUTOHSCROLL
     EDITTEXT        IDC_CS_DENISEREV,311,289,45,13,ES_AUTOHSCROLL
-    CONTROL         "Z3 Autoconfig",IDC_CS_Z3AUTOCONFIG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,127,184,104,11
-    CONTROL         "CDTV-CR",IDC_CS_CDTVCR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,143,123,11
-    CONTROL         "1M Chip / 0.5M+0.5M",IDC_CS_1MCHIPJUMPER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,197,104,11
 END
 
 IDD_AVIOUTPUT DIALOGEX 0, 0, 396, 260
@@ -813,13 +833,15 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
     GROUPBOX        "Filter Settings",-1,1,1,393,160
-    COMBOBOX        IDC_FILTERMODE,9,31,167,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FILTERSTACK,182,31,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FILTERFILTER,215,31,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Reset to defaults",IDC_FILTERDEFAULT,283,31,106,14
-    COMBOBOX        IDC_FILTEROVERLAYTYPE,9,52,118,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FILTEROVERLAY,134,52,145,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_FILTERAUTOSCALE,284,52,104,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERMODE,9,31,153,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERSTACK,167,31,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERFILTER,199,31,63,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTEROVERLAYTYPE,9,52,119,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTEROVERLAY,134,52,129,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTER_NATIVERTG,268,12,120,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Reset to defaults",IDC_FILTERDEFAULT,268,31,121,14
+    COMBOBOX        IDC_FILTERAUTOSCALE,268,52,88,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_FILTERINTEGER,361,52,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Horiz. size:",-1,7,79,81,10,SS_CENTERIMAGE
     COMBOBOX        IDC_FILTERHZMULT,92,78,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Vert. size:",-1,7,100,81,10,SS_CENTERIMAGE
@@ -850,7 +872,6 @@ BEGIN
     PUSHBUTTON      "Load",IDC_FILTERPRESETLOAD,205,272,55,14
     PUSHBUTTON      "Save",IDC_FILTERPRESETSAVE,265,272,55,14
     PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,325,272,55,14
-    COMBOBOX        IDC_FILTER_NATIVERTG,284,12,104,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_HARDDRIVE DIALOGEX 0, 0, 396, 109
@@ -862,14 +883,13 @@ BEGIN
     COMBOBOX        IDC_HARDDRIVE,49,9,339,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     EDITTEXT        IDC_HDFINFO,5,29,385,12,ES_CENTER | ES_READONLY
     EDITTEXT        IDC_HDFINFO2,5,46,385,12,ES_CENTER | ES_READONLY
-    DEFPUSHBUTTON   "Create hard disk image file",IDC_HARDDRIVE_IMAGE,49,67,115,14
+    DEFPUSHBUTTON   "Create hard disk image file",IDC_HARDDRIVE_IMAGE,40,67,115,14
     EDITTEXT        IDC_PATH_NAME,188,67,97,15,ES_AUTOHSCROLL | NOT WS_VISIBLE
-    RTEXT           "HD Controller:",IDC_STATIC,16,90,56,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_HDF_CONTROLLER,80,89,92,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Read/write",IDC_HDF_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,315,71,60,10
+    COMBOBOX        IDC_HDF_CONTROLLER,8,89,164,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,179,89,25,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     DEFPUSHBUTTON   "Add hard drive",IDOK,236,87,73,14
     PUSHBUTTON      "Cancel",IDCANCEL,316,87,73,14
-    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,179,89,25,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_MISC2 DIALOGEX 0, 0, 396, 278
@@ -887,17 +907,17 @@ BEGIN
     COMBOBOX        IDC_INACTIVE_PRIORITY,144,33,108,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Pause emulation",IDC_INACTIVE_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,67,109,10
     CONTROL         "Disable sound",IDC_INACTIVE_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,81,109,10
+    CONTROL         "Disable game controllers",IDC_INACTIVE_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,95,109,10
     GROUPBOX        "When Minimized",IDC_STATIC,269,7,125,105
     CTEXT           "Run at priority:",IDC_MINIMIZED_PRI,278,19,109,10,SS_CENTERIMAGE | WS_TABSTOP
     COMBOBOX        IDC_MINIMIZED_PRIORITY,278,33,108,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Pause emulation",IDC_MINIMIZED_PAUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,67,108,10
     CONTROL         "Disable sound",IDC_MINIMIZED_NOSOUND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,81,108,10
+    CONTROL         "Disable game controllers",IDC_MINIMIZED_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,95,107,10
     GROUPBOX        "File Extension Associations",IDC_STATIC,0,120,260,155
     CONTROL         "",IDC_ASSOCIATELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,9,137,238,108
     PUSHBUTTON      "Associate all",IDC_ASSOCIATE_ON,36,253,85,14
     PUSHBUTTON      "Deassociate all",IDC_ASSOCIATE_OFF,125,253,85,14
-    CONTROL         "Disable game controllers",IDC_INACTIVE_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,143,95,109,10
-    CONTROL         "Disable game controllers",IDC_MINIMIZED_NOJOY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,280,95,107,10
 END
 
 IDD_DISK DIALOGEX 0, 0, 396, 318
@@ -906,9 +926,9 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     PUSHBUTTON      "Insert floppy disk image",IDC_DISKLISTINSERT,8,299,121,15
     PUSHBUTTON      "Remove floppy disk image",IDC_DISKLISTREMOVE,137,299,121,15
+    PUSHBUTTON      "Remove all",IDC_DISKLISTREMOVEALL,266,299,121,15
     COMBOBOX        IDC_DISKTEXT,1,281,393,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
     CONTROL         "",IDC_DISKLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,1,4,393,275
-    PUSHBUTTON      "Remove all",IDC_DISKLISTREMOVEALL,266,299,121,15
 END
 
 IDD_PANEL DIALOGEX 0, 0, 530, 345
@@ -933,13 +953,14 @@ IDD_PATHS DIALOGEX 0, 0, 396, 303
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
-    LTEXT           "System ROMs:",IDC_PATHS_ROML,3,2,260,8,SS_CENTERIMAGE
+    LTEXT           "System ROMs:",IDC_PATHS_ROML,3,2,167,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_ROM,3,13,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_ROMS,384,13,11,15
+    CONTROL         "Scan subfolders",IDC_PATHS_RECURSIVEROMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,1,197,11
     LTEXT           "Configuration files:",IDC_PATHS_CONFIGL,3,32,164,8,SS_CENTERIMAGE
-    CONTROL         "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,31,197,11
     EDITTEXT        IDC_PATHS_CONFIG,3,44,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_CONFIGS,384,43,11,15
+    CONTROL         "Cache Configuration files",IDC_PATHS_CONFIGCACHE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,31,197,11
     LTEXT           "Screenshots:",IDC_PATHS_SCREENSHOTL,3,62,260,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_SCREENSHOT,3,73,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_SCREENSHOTS,384,72,11,15
@@ -949,26 +970,28 @@ BEGIN
     LTEXT           "Videos:",IDC_PATHS_AVIOUTPUTL,3,120,260,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_AVIOUTPUT,3,131,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_AVIOUTPUTS,384,130,11,15
-    LTEXT           "Saveimages:",IDC_PATHS_SAVEIMAGEL,3,149,260,8,SS_CENTERIMAGE
+    LTEXT           "Saveimages:",IDC_PATHS_SAVEIMAGEL,3,149,158,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_SAVEIMAGE,3,161,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_SAVEIMAGES,384,160,11,15
+    CONTROL         "Use original image's path",IDC_PATHS_SAVEIMAGEORIGINALPATH,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,177,148,197,11
     LTEXT           "Rips:",IDC_PATHS_RIPSL,3,179,260,8,SS_CENTERIMAGE
     EDITTEXT        IDC_PATHS_RIP,3,190,377,15,ES_AUTOHSCROLL
     PUSHBUTTON      "...",IDC_PATHS_RIPS,383,189,11,15
     PUSHBUTTON      "Reset to defaults",IDC_PATHS_DEFAULT,2,212,92,14
     PUSHBUTTON      "Rescan ROMs",IDC_ROM_RESCAN,2,229,92,14
-    PUSHBUTTON      "Clear disk history",IDC_RESETDISKHISTORY,99,229,92,14
     COMBOBOX        IDC_PATHS_DEFAULTTYPE,99,213,163,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "Clear registry",IDC_RESETREGISTRY,302,212,92,14
+    PUSHBUTTON      "Clear disk history",IDC_RESETDISKHISTORY,99,229,92,14
     CONTROL         "Use relative paths",IDC_PATHS_RELATIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,199,231,94,11
-    EDITTEXT        IDC_LOGPATH,7,281,324,13,ES_READONLY
-    PUSHBUTTON      "Open [] Open selected file.",IDC_LOGOPEN,337,280,51,14
+    PUSHBUTTON      "Clear registry",IDC_RESETREGISTRY,302,212,92,14
+    CONTROL         "Portable mode",IDC_REGISTRYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,303,231,82,11
+    GROUPBOX        "Debug logging",IDC_STATIC,1,248,393,53
     COMBOBOX        IDC_LOGSELECT,7,263,137,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Enable full logging",IDC_LOGENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,264,93,12
-    PUSHBUTTON      "Save All [] Save and open both logs and config file.",IDC_LOGSAVE,337,264,51,14
-    GROUPBOX        "Debug logging",IDC_STATIC,1,248,393,53
     CONTROL         "Log window",IDC_LOGENABLE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,254,264,68,12
-    CONTROL         "Portable mode",IDC_REGISTRYMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,303,231,82,11
+    PUSHBUTTON      "Save All [] Create zip file that includes both logs and config file.",IDC_LOGSAVE,337,264,51,14
+    PUSHBUTTON      "Open [] Open selected file.",IDC_LOGOPEN,337,280,51,14
+    EDITTEXT        IDC_LOGPATH,7,281,324,13,ES_READONLY
 END
 
 IDD_QUICKSTART DIALOGEX 0, 0, 396, 262
@@ -1120,7 +1143,9 @@ BEGIN
     CONTROL         "Catweasel Z2 emulation [] Catweasel MK2 Zorro II card emulation. Physical Windows compatible Catweasel card and drivers required.",IDC_CATWEASEL,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,216,147,11
     CONTROL         "uaescsi.device",IDC_SCSIDEVICE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,229,147,11
-    CONTROL         "Include host SCSI devices",IDC_CS_SCSIMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,271,147,11
+    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,242,151,11
+    CONTROL         "Toccata Z2 sound card emulation",IDC_CS_TOCCATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,255,151,11
+    CONTROL         "Toccata Paula/CD audio mix",IDC_CS_TOCCATAMIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,267,151,11
     GROUPBOX        "Network",IDC_STATIC,181,197,213,86
     CONTROL         "bsdsocket.library [] bsdsocket network library emulation.",IDC_SOCKETS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,215,187,11
@@ -1129,7 +1154,7 @@ BEGIN
     CONTROL         "A2065 Z2 [] A2065 Ethernet Zorro II card emulation.",IDC_A2065,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,241,187,11
     COMBOBOX        IDC_NETDEVICE,202,256,178,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "CD32 Full Motion Video cartridge",IDC_CS_CD32FMV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,242,151,11
+    CONTROL         "Include host SCSI devices",IDC_CS_SCSIMODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,202,271,147,11
 END
 
 IDD_INPUTMAP DIALOGEX 0, 0, 421, 341
@@ -1179,28 +1204,29 @@ CAPTION "CD Settings"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     RTEXT           "HD Controller:",IDC_STATIC,7,90,65,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_HDF_CONTROLLER,83,89,100,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Add CD Drive",IDOK,236,89,73,14
-    PUSHBUTTON      "Cancel",IDCANCEL,316,89,73,14
+    COMBOBOX        IDC_HDF_CONTROLLER,80,89,122,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,208,89,25,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "Add CD Drive",IDOK,238,89,73,14
+    PUSHBUTTON      "Cancel",IDCANCEL,318,89,73,14
     CONTROL         "",IDC_CDLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,4,387,77
-    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,189,89,25,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_TAPEDRIVE DIALOGEX 0, 0, 395, 80
+IDD_TAPEDRIVE DIALOGEX 0, 0, 395, 97
 STYLE DS_LOCALEDIT | DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_CENTER | DS_CENTERMOUSE | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
 CAPTION "Tape Drive Settings"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     RTEXT           "Path:",IDC_STATIC,4,18,43,10,SS_CENTERIMAGE
-    PUSHBUTTON      "Select Directory",IDC_TAPE_SELECT_DIR,19,36,123,15
-    PUSHBUTTON      "Select Archive or Plain File",IDC_TAPE_SELECT_FILE,160,36,123,15
-    CONTROL         "Read/write",IDC_TAPE_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,313,39,67,10
-    RTEXT           "HD Controller:",IDC_STATIC,7,61,65,10,SS_CENTERIMAGE
-    COMBOBOX        IDC_HDF_CONTROLLER,79,59,100,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
-    DEFPUSHBUTTON   "Add Tape Drive",IDOK,223,58,88,14
-    PUSHBUTTON      "Cancel",IDCANCEL,318,58,67,14
-    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,186,59,25,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_PATH_NAME,52,15,332,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Select Directory",IDC_TAPE_SELECT_DIR,13,36,123,15
+    PUSHBUTTON      "Select Archive or Plain File",IDC_TAPE_SELECT_FILE,146,36,123,15
+    PUSHBUTTON      "Eject",IDC_TAPE_EJECT,278,36,105,15
+    RTEXT           "HD Controller:",IDC_STATIC,7,60,65,10,SS_CENTERIMAGE
+    COMBOBOX        IDC_HDF_CONTROLLER,79,58,148,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_HDF_CONTROLLER_UNIT,235,58,31,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Read/write",IDC_TAPE_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,277,58,67,10
+    DEFPUSHBUTTON   "Add Tape Drive",IDOK,106,75,88,14
+    PUSHBUTTON      "Cancel",IDCANCEL,200,76,88,14
 END
 
 IDD_DISKINFO DIALOGEX 0, 0, 491, 323
@@ -1220,8 +1246,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,0,0,0
- PRODUCTVERSION 3,0,0,0
+ FILEVERSION 3,1,0,0
+ PRODUCTVERSION 3,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1237,12 +1263,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "3.0.0.0"
+            VALUE "FileVersion", "3.1.0.0"
             VALUE "InternalName", "WinUAE"
-            VALUE "LegalCopyright", "© 1996-2014 under the GNU Public License (GPL)"
+            VALUE "LegalCopyright", "© 1996-2015 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "3.0.0.0"
+            VALUE "ProductVersion", "3.1.0.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -1349,7 +1375,6 @@ GUIDELINES DESIGNINFO
 BEGIN
     IDD_KICKSTART, DIALOG
     BEGIN
-        BOTTOMMARGIN, 275
     END
 
     IDD_DISPLAY, DIALOG
@@ -1358,7 +1383,7 @@ BEGIN
 
     IDD_MEMORY, DIALOG
     BEGIN
-        BOTTOMMARGIN, 287
+        BOTTOMMARGIN, 301
     END
 
     IDD_CPU, DIALOG
@@ -1409,6 +1434,7 @@ BEGIN
 
     IDD_HARDFILE, DIALOG
     BEGIN
+        RIGHTMARGIN, 396
     END
 
     IDD_FILESYS, DIALOG
@@ -1437,7 +1463,6 @@ BEGIN
 
     IDD_FILTER, DIALOG
     BEGIN
-        BOTTOMMARGIN, 288
     END
 
     IDD_HARDDRIVE, DIALOG
@@ -1446,7 +1471,6 @@ BEGIN
 
     IDD_MISC2, DIALOG
     BEGIN
-        BOTTOMMARGIN, 263
     END
 
     IDD_DISK, DIALOG
@@ -1812,7 +1836,7 @@ BEGIN
     IDS_QS_MODEL_A500       "1.3 ROM, OCS, 512 KB Chip + 512 KB Slow RAM (most common)\nThis configuration is capable of running most games and demos produced for first-generation hardware. Only few exceptions need a different configuration (e.g. the oldest games tend to be incompatible with this configuration).\n1.3 ROM, ECS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nLater hardware revision of the A500. Nearly 100% compatible with the previous configuration.\n1.3 ROM, ECS Agnus, 1 MB Chip RAM\nFew newer games and demos require this configuration.\n1.3 ROM, OCS Agnus, 512 KB Chip RAM\nVery old (e.g. pre-1988) games and demos may require this configuration.\n1.2 ROM, OCS Agnus, 512 KB Chip RAM\nAs available for the A1000, and installed on the first A500 and A2000 series. Some very old programs only work correctly with this configuration. Note: This system ROM version can only boot from floppy disk (no hard disk boot support).\n1.2 ROM, OCS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nThis configuration adds expansion memory to the first A500 produced. Try this if your game does not work with newer configurations, but works with the previous one. It could add some features to the game, including faster loading times. Note: This system ROM version can only boot from floppy disk (no hard disk boot support)."
     IDS_QS_MODEL_A500P      "Basic non-expanded configuration\nThe A500+ adds an ECS Agnus chip, 1 MB of Chip RAM and a 2.0 ROM to the A500. Many A500 games and demos don't work properly on an A500+.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n"
     IDS_QS_MODEL_A600       "Basic non-expanded configuration\nThe A600 is smaller than the A500+ and has an updated 2.0 ROM.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n"
-    IDS_QS_MODEL_A1000      "512 KB Chip RAM\nThe A1000 was the first model produced, with a configuration equivalent to that of an A500 with OCS chipset. You normally don't need to use this configuration, unless you are nostalgic and would like to hear the short A1000 boot tune\n""ICS"" Denise without EHB support\nVery first A1000 models had Denise without EHB capability.\n256 KB Chip RAM\n Unexpanded A1000. All later A1000 models were sold with a 256 KB RAM expansion built-in."
+    IDS_QS_MODEL_A1000      "512 KB Chip RAM\nThe A1000 was the first model produced, with a configuration equivalent to that of an A500 with OCS chipset. You normally don't need to use this configuration, unless you are nostalgic and would like to hear the short A1000 boot tune\n""ICS"" Denise without EHB support\nVery first A1000 models had Denise without EHB capability.\n256 KB Chip RAM\n Unexpanded A1000. All later A1000 models were sold with a 256 KB RAM expansion built-in.\nA1000 ""Velvet"" Prototype\n"
     IDS_QS_MODEL_A1200      "Basic non-expanded configuration\nUse this configuration to run most AGA demos and games\n4 MB Fast RAM expanded configuration\nSome newer AGA games and demos need an expanded A1200 to run.\nBlizzard 1230 IV\n\nBlizzard 1240\n\nBlizzard 1260\n\nBlizzard PPC\n"
     IDS_QS_MODEL_CD32       "CD32\nThe CD32 was one the first 32-bit consoles on the market. It is basically an A1200 with a built-in CD-ROM drive. Insert your CD32 or CDTV CD-ROM into a free CD-ROM drive before starting the emulation.\nCD32 with Full Motion Video cartridge\n"
     IDS_QS_MODEL_CDTV       "CDTV\nThe CDTV was the first model with a built-in CD-ROM drive. Looking like a black CD player, it featured a configuration equivalent to that of an A500 with 1 MB RAM and an ECS chipset.\nFloppy drive and 64KB SRAM card expanded CDTV\n\nCDTV-CR\n"
@@ -1921,10 +1945,11 @@ BEGIN
     IDS_FILTER_PAL_EXTRA    "Brightness\nContrast\nSaturation\nGamma\nScanlines\nBlurriness\nNoise\n"
     IDS_FILTER_3D_EXTRA     "Point/Bilinear\nScanline opacity\nScanline level\n"
     IDS_ALWAYS_ON           "Always on"
-    IDS_DISPLAY_ATTRIBUTES  "Brightness\nContrast\nGamma"
+    IDS_DISPLAY_ATTRIBUTES  "Brightness\nContrast\nGamma\nGamma [R]\nGamma [G]\nGamma [B]"
     IDS_NUMSG_NO_PPC        "PPC CPU was started but PPC CPU emulation core plugin was not found. Download available from http://www.winuae.net/"
     IDS_NUMSG_UAEBOOTROM_PCC 
                             "PPC native OS booted with UAE boot ROM active. UAE expansions are not hardware emulated and are not PPC compatible. (UAE HD controller, uaescsi.device, uaeserial, bsdsocket and so on..)"
+    IDS_AUTOSCALE_OVERSCAN_BLANK "Overscan blanking"
 END
 
 #endif    // English resources
diff --git a/od-win32/win32.h b/od-win32/win32.h
index c1c4c6d7..6abc68bc 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("23")
+#define WINUAEBETA _T("")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2015, 6, 2)
+#define WINUAEDATE MAKEBD(2015, 6, 7)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")
@@ -34,7 +34,7 @@
 #define WINUAEEXTRA _T("")
 #endif
 #ifndef WINUAEREV
-#define WINUAEREV _T("RC3")
+#define WINUAEREV _T("")
 #endif
 
 #define IHF_WINDOWHIDDEN 6
diff --git a/od-win32/win32gfx.cpp b/od-win32/win32gfx.cpp
index 537407b0..fb2e377c 100644
--- a/od-win32/win32gfx.cpp
+++ b/od-win32/win32gfx.cpp
@@ -1723,7 +1723,7 @@ static int open_windows (bool mousecapture)
 	bool startminimized = !started && currprefs.win32_start_minimized && isfullscreen () <= 0;
 	int input = 0;
 
-	if (!rp_isactive () && mousecapture && startactive)
+	if (mousecapture && startactive)
 		setmouseactive (-1);
 
 	int upd = 0;
diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 15f0acb9..d4ca5556 100644
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -1687,7 +1687,7 @@ static void show_rom_list (void)
 		124, -1, -1, // kupke golem
 		131, -1, -1, // protar
 		130, -1, -1, // m-tec
-		129, -1, -1, // adide
+		129, 141, -1, -1, // adide
 		133, -1, -1, // adscsi
 		127, 140, -1, -1, // kommos
 		128, -1, -1, // vector falcon
@@ -5174,7 +5174,7 @@ static urlinfo urls[] =
 //	{IDC_UAEHOME, FALSE, _T("UAE Home Page"), _T("http://www.amigaemulator.org/")},
 	{IDC_WINUAEHOME, FALSE, _T("WinUAE Home Page"), _T("http://www.winuae.net/")},
 //	{IDC_AIABHOME, FALSE, _T("AIAB"), _T("http://www.amigainabox.co.uk/")},
-	{IDC_THEROOTS, FALSE, _T("Back To The Roots"), _T("http://www.back2roots.org/")},
+	{IDC_THEROOTS, FALSE, _T("Back To The Roots"), _T("http://back2roots.abime.net/")},
 	{IDC_ABIME, FALSE, _T("abime.net"), _T("http://www.abime.net/")},
 	{IDC_CAPS, FALSE, _T("SPS"), _T("http://www.softpres.org/")},
 	{IDC_AMIGASYS, FALSE, _T("AmigaSYS"), _T("http://www.amigasys.com/")},
diff --git a/od-win32/winuae_msvc11/winuae_msvc.sln b/od-win32/winuae_msvc11/winuae_msvc.sln
index b1dd8513..32b37f7c 100644
--- a/od-win32/winuae_msvc11/winuae_msvc.sln
+++ b/od-win32/winuae_msvc11/winuae_msvc.sln
@@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genlinetoscr", "..\genlinet
 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "wix", "..\wix\wix.wixproj", "{BE211CE1-3955-4674-A664-5038FC791980}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "resourcedll", "..\resourcedll\resourcedll.vcxproj", "{C85288FB-A035-42CA-B5FB-8E6214319E97}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Mixed Platforms = Debug|Mixed Platforms
@@ -267,6 +269,41 @@ Global
 		{BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x64.ActiveCfg = Release|x86
 		{BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x86.ActiveCfg = Release|x86
 		{BE211CE1-3955-4674-A664-5038FC791980}.TestRelease|x86.Build.0 = Release|x86
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|Win32.Build.0 = Debug|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x64.ActiveCfg = Debug|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x86.ActiveCfg = Debug|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Debug|x86.Build.0 = Debug|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Mixed Platforms.ActiveCfg = FullRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Mixed Platforms.Build.0 = FullRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.ActiveCfg = FullRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|Win32.Build.0 = FullRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x64.ActiveCfg = FullRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x86.ActiveCfg = FullRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.FullRelease|x86.Build.0 = FullRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.ActiveCfg = Release|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|Win32.Build.0 = Release|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x64.ActiveCfg = Release|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x86.ActiveCfg = Release|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Release|x86.Build.0 = Release|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.ActiveCfg = Test|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Mixed Platforms.Build.0 = Test|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Win32.ActiveCfg = Test|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|Win32.Build.0 = Test|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x64.ActiveCfg = Test|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x86.ActiveCfg = Test|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.Test|x86.Build.0 = Test|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Mixed Platforms.ActiveCfg = TestRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Mixed Platforms.Build.0 = TestRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Win32.ActiveCfg = TestRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|Win32.Build.0 = TestRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|x64.ActiveCfg = TestRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|x86.ActiveCfg = TestRelease|Win32
+		{C85288FB-A035-42CA-B5FB-8E6214319E97}.TestRelease|x86.Build.0 = TestRelease|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index a1e649b3..156d1ad6 100644
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,9 @@
 
+3.1.0
+
+- Unticked "Game controllers disabled" works now in DirectInput mode.
+- 68030 data cache fix.
+
 Beta 23: (RC3)
 
 - Toccata audio didn't automatically re-enable audio if it was stopped by automatic switching.