diff --git a/src/include/options.h b/src/include/options.h
index d636347a..3a18d506 100644
--- a/src/include/options.h
+++ b/src/include/options.h
@@ -562,6 +562,11 @@ extern void fixup_cpu (struct uae_prefs *prefs);
 extern void cfgfile_compatibility_romtype(struct uae_prefs *p);
 extern void cfgfile_compatibility_rtg(struct uae_prefs *p);
 
+
+extern void whdload_auto_prefs (struct uae_prefs *p, char* filename);
+
+
+
 extern void check_prefs_changed_custom (void);
 extern void check_prefs_changed_cpu (void);
 extern void check_prefs_changed_audio (void);
diff --git a/src/main.cpp b/src/main.cpp
index 5276bd3f..436ce395 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -463,6 +463,7 @@ void  print_usage()
 	printf("\nUsage:\n");
 	printf(" -f <file>                  Load a configuration file.\n");
 	printf(" -config=<file>             Load a configuration file.\n");
+        printf(" -autowhdload=<file>        Load a WHDLoad game pack.\n");
 	printf(" -statefile=<file>          Load a save state file.\n");
 	printf(" -s <config param>=<value>  Set the configuration parameter with value.\n");
 	printf("                            Edit a configuration file in order to know valid parameters and settings.\n");
@@ -517,6 +518,13 @@ static void parse_cmdline(int argc, TCHAR **argv)
 			xfree(txt);
 			loaded = true;
 		}
+		else if (_tcsncmp(argv[i], _T("-autowhdload="), 13) == 0) {
+			TCHAR *txt = parsetextpath(argv[i] + 13);                        
+                        whdload_auto_prefs (&currprefs, txt);                     
+			xfree(txt);
+                        firstconfig = false;
+			loaded = true;
+                }
 		else if (_tcscmp(argv[i], _T("-f")) == 0) {
 			/* Check for new-style "-f xxx" argument, where xxx is config-file */
 			if (i + 1 == argc) {
diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp
index 753b9dca..d377ce78 100644
--- a/src/osdep/amiberry.cpp
+++ b/src/osdep/amiberry.cpp
@@ -45,6 +45,11 @@
 extern FILE *debugfile;
 #endif
 
+
+#include "crc32.h"
+#include "fsdb.h"
+
+
 int quickstart_start = 1;
 int quickstart_model = 0;
 int quickstart_conf = 0;
@@ -1262,3 +1267,176 @@ int amiga_clipboard_want_data()
 void clipboard_vsync()
 {
 }
+
+
+
+static TCHAR *parsetext(const TCHAR *s)
+{
+	if (*s == '"' || *s == '\'') {
+		TCHAR *d;
+		TCHAR c = *s++;
+		int i;
+		d = my_strdup(s);
+		for (i = 0; i < _tcslen(d); i++) {
+			if (d[i] == c) {
+				d[i] = 0;
+				break;
+			}
+		}
+		return d;
+	}
+	else {
+		return my_strdup(s);
+	}
+}
+
+static TCHAR *parsetextpath(const TCHAR *s)
+{
+	TCHAR *s2 = parsetext(s);
+	TCHAR *s3 = target_expand_environment(s2, NULL, 0);
+	xfree(s2);
+	return s3;
+}
+
+
+long GetFileSize(std::string filename)
+{
+    struct stat stat_buf;
+    int rc = stat(filename.c_str(), &stat_buf);
+    return rc == 0 ? stat_buf.st_size : -1;
+}
+
+void RemoveChar(char* array, int len, int index)
+{
+  for(int i = index; i < len-1; ++i)
+    array[i] = array[i+1];
+  array[len-1] = 0;
+}
+
+
+int whdhost_parse_option(struct uae_prefs* p, const char* option, const char* value)
+{
+    
+}
+
+
+void whdload_auto_prefs (struct uae_prefs* p, char* filepath)
+
+{
+    
+    // setup variables etc
+    TCHAR *txt2;
+    TCHAR tmp[MAX_DPATH];
+    
+    // find the SHA1 - this currently does not return the correct result!! 
+    long filesize;   
+    filesize = GetFileSize(filepath);
+   // const TCHAR* filesha = get_sha1_txt (input, filesize);
+
+  // REMOVE THE FILE PATH AND EXTENSION
+    const TCHAR* filename = my_getfilepart(filepath);
+    
+         
+  // SET UNIVERSAL DEFAULTS
+    p->start_gui = false;
+
+   //_tcscpy(last_loaded_config, _T(filename));
+  // OPTIONSFILENAME = filename;
+   //ConfigFileInfo->Name = filename;
+   
+
+
+       
+   // SOMEWHERE HERE WE NEED TO SET THE GAME 'NAME' FOR SAVESTATE ETC PURPOSES
+     
+         
+    //SET THE BASE AMIGA      
+        built_in_prefs(&currprefs, 3, 1, 0, 0);
+ 
+     // DO A CHECK FOR AGA
+       
+       const int is_aga = strstr(filename,"_AGA") != NULL;
+ 
+     // A1200 no AGA 
+       if (is_aga == false)   
+        {
+           _tcscpy(p->description, _T("WHDLoad AutoBoot Configuration"));
+           
+            p->cs_compatible = CP_A600;
+            built_in_chipset_prefs(p);
+            p->chipset_mask = CSMASK_ECS_AGNUS | CSMASK_ECS_DENISE;
+            p->m68k_speed = 0;
+           
+           // cfgfile_parse_option(&currprefs, _T("chipset="), _T("ecs"), 0);  
+           // cfgfile_parse_option(&currprefs, _T("cpu_type="), _T("68ec020"), 0);             
+
+        }
+     // A1200
+       else
+           _tcscpy(p->description, _T("WHDLoad AutoBoot Configuration [AGA]"));
+
+       
+       //SET THE WHD BOOTER AND GAME DATA  
+   
+     
+        char BootPath[MAX_DPATH];
+ 	strncpy(currentDir, start_path_data, MAX_DPATH);
+        snprintf(BootPath, MAX_DPATH, "%s/whdboot/boot-data/", start_path_data);
+        
+    
+      // set the first (whdboot) Drive
+         _stprintf(tmp,_T("filesystem2=rw,DH0:DH0:%s,10"),BootPath);   
+         txt2 = parsetextpath(_T(tmp));
+         cfgfile_parse_line(p, txt2, 0);
+
+
+         _stprintf(tmp,_T("uaehf0=dir,rw,DH0:DH0::%s,10") , BootPath);
+         txt2 = parsetextpath(_T(tmp));
+         cfgfile_parse_line(p, txt2, 0);
+
+       //set the Second (game data) drive
+         _stprintf(tmp,"filesystem2=rw,DH1:games:%s,0" , filepath);
+         txt2 = parsetextpath(_T(tmp));
+         cfgfile_parse_line(p, txt2, 0);
+
+         _stprintf(tmp,"uaehf1=dir,rw,DH1:games:%s,0" , filepath);
+         txt2 = parsetextpath(_T(tmp));
+         cfgfile_parse_line(p, txt2, 0);
+    
+
+   //SET/GET THE HOST SETTINGS 
+          
+
+         
+   //  SET THE GAME SETTINGS
+      	char WHDPath[MAX_DPATH];
+	strncpy(currentDir, start_path_data, MAX_DPATH);
+	snprintf(WHDPath, MAX_DPATH, "%s/whdboot/game-data/", start_path_data);          
+                
+           // EDIT THE FILE NAME TO USE HERE
+        char WHDConfig[255];
+ 	strcpy(WHDConfig, WHDPath);
+        strcat(WHDConfig,filename);
+        strcat(WHDConfig,".whd");     
+        
+        printf("\nWHD file: %s  \n",WHDConfig);
+        
+        int *type;
+         
+        // LOAD GAME SPECIFICS - USE SHA1 IF AVAILABLE
+        if (zfile_exists(WHDConfig))
+                cfgfile_load(p, WHDConfig, type, 0, 1);
+     
+
+       // APPLY SPECIAL OPTIONS E.G. MOUSE OR ALT. JOYSTICK SETTINGS
+        
+        
+
+                extractFileName(filepath, last_loaded_config);
+
+
+      //  CLEAN UP SETTINGS (MAYBE??)
+         
+    // fixup_prefs(&currprefs, true); 
+    // cfgfile_configuration_change(1);
+}
\ No newline at end of file
diff --git a/whdboot/boot-data/C/Assign b/whdboot/boot-data/C/Assign
new file mode 100755
index 00000000..1ba33164
Binary files /dev/null and b/whdboot/boot-data/C/Assign differ
diff --git a/whdboot/boot-data/C/Copy b/whdboot/boot-data/C/Copy
new file mode 100755
index 00000000..31132b0d
Binary files /dev/null and b/whdboot/boot-data/C/Copy differ
diff --git a/whdboot/boot-data/C/Dir b/whdboot/boot-data/C/Dir
new file mode 100755
index 00000000..06fc6641
Binary files /dev/null and b/whdboot/boot-data/C/Dir differ
diff --git a/whdboot/boot-data/C/DiskInDrive b/whdboot/boot-data/C/DiskInDrive
new file mode 100755
index 00000000..9b1b653f
Binary files /dev/null and b/whdboot/boot-data/C/DiskInDrive differ
diff --git a/whdboot/boot-data/C/Ed b/whdboot/boot-data/C/Ed
new file mode 100755
index 00000000..2a1acbb6
Binary files /dev/null and b/whdboot/boot-data/C/Ed differ
diff --git a/whdboot/boot-data/C/Execute b/whdboot/boot-data/C/Execute
new file mode 100755
index 00000000..9944e85c
Binary files /dev/null and b/whdboot/boot-data/C/Execute differ
diff --git a/whdboot/boot-data/C/GetMouseInput b/whdboot/boot-data/C/GetMouseInput
new file mode 100755
index 00000000..d094ab9d
Binary files /dev/null and b/whdboot/boot-data/C/GetMouseInput differ
diff --git a/whdboot/boot-data/C/Info b/whdboot/boot-data/C/Info
new file mode 100755
index 00000000..d3390c29
Binary files /dev/null and b/whdboot/boot-data/C/Info differ
diff --git a/whdboot/boot-data/C/List b/whdboot/boot-data/C/List
new file mode 100755
index 00000000..b76c5f4e
Binary files /dev/null and b/whdboot/boot-data/C/List differ
diff --git a/whdboot/boot-data/C/Makedir b/whdboot/boot-data/C/Makedir
new file mode 100755
index 00000000..0fae0eca
Binary files /dev/null and b/whdboot/boot-data/C/Makedir differ
diff --git a/whdboot/boot-data/C/Rename b/whdboot/boot-data/C/Rename
new file mode 100755
index 00000000..779610dd
Binary files /dev/null and b/whdboot/boot-data/C/Rename differ
diff --git a/whdboot/boot-data/C/Search b/whdboot/boot-data/C/Search
new file mode 100755
index 00000000..d0e56d2e
Binary files /dev/null and b/whdboot/boot-data/C/Search differ
diff --git a/whdboot/boot-data/C/SetPatch b/whdboot/boot-data/C/SetPatch
new file mode 100755
index 00000000..73408ae2
Binary files /dev/null and b/whdboot/boot-data/C/SetPatch differ
diff --git a/whdboot/boot-data/C/Type b/whdboot/boot-data/C/Type
new file mode 100755
index 00000000..ec071222
Binary files /dev/null and b/whdboot/boot-data/C/Type differ
diff --git a/whdboot/boot-data/C/Version b/whdboot/boot-data/C/Version
new file mode 100755
index 00000000..96f8a714
Binary files /dev/null and b/whdboot/boot-data/C/Version differ
diff --git a/whdboot/boot-data/C/WHDLoad b/whdboot/boot-data/C/WHDLoad
new file mode 100755
index 00000000..90e9c98b
Binary files /dev/null and b/whdboot/boot-data/C/WHDLoad differ
diff --git a/whdboot/boot-data/C/Wait b/whdboot/boot-data/C/Wait
new file mode 100755
index 00000000..3523bbbe
Binary files /dev/null and b/whdboot/boot-data/C/Wait differ
diff --git a/whdboot/boot-data/C/delete b/whdboot/boot-data/C/delete
new file mode 100755
index 00000000..0db0283e
Binary files /dev/null and b/whdboot/boot-data/C/delete differ
diff --git a/whdboot/boot-data/C/joytest b/whdboot/boot-data/C/joytest
new file mode 100755
index 00000000..f1ac9caf
Binary files /dev/null and b/whdboot/boot-data/C/joytest differ
diff --git a/whdboot/boot-data/C/jst b/whdboot/boot-data/C/jst
new file mode 100755
index 00000000..2bba40c6
Binary files /dev/null and b/whdboot/boot-data/C/jst differ
diff --git a/whdboot/boot-data/C/kgiconload b/whdboot/boot-data/C/kgiconload
new file mode 100755
index 00000000..ed7d0759
Binary files /dev/null and b/whdboot/boot-data/C/kgiconload differ
diff --git a/whdboot/boot-data/Devs/Kickstarts/kick33180.A500.RTB b/whdboot/boot-data/Devs/Kickstarts/kick33180.A500.RTB
new file mode 100755
index 00000000..89fba0b7
Binary files /dev/null and b/whdboot/boot-data/Devs/Kickstarts/kick33180.A500.RTB differ
diff --git a/whdboot/boot-data/Devs/Kickstarts/kick33192.A500.RTB b/whdboot/boot-data/Devs/Kickstarts/kick33192.A500.RTB
new file mode 100755
index 00000000..89fba0b7
Binary files /dev/null and b/whdboot/boot-data/Devs/Kickstarts/kick33192.A500.RTB differ
diff --git a/whdboot/boot-data/Devs/Kickstarts/kick34005.A500.RTB b/whdboot/boot-data/Devs/Kickstarts/kick34005.A500.RTB
new file mode 100755
index 00000000..2407ca0b
Binary files /dev/null and b/whdboot/boot-data/Devs/Kickstarts/kick34005.A500.RTB differ
diff --git a/whdboot/boot-data/Devs/Kickstarts/kick40063.A600.RTB b/whdboot/boot-data/Devs/Kickstarts/kick40063.A600.RTB
new file mode 100755
index 00000000..bf69abda
Binary files /dev/null and b/whdboot/boot-data/Devs/Kickstarts/kick40063.A600.RTB differ
diff --git a/whdboot/boot-data/Devs/Kickstarts/kick40068.A1200.RTB b/whdboot/boot-data/Devs/Kickstarts/kick40068.A1200.RTB
new file mode 100755
index 00000000..0b33bd12
Binary files /dev/null and b/whdboot/boot-data/Devs/Kickstarts/kick40068.A1200.RTB differ
diff --git a/whdboot/boot-data/Devs/Kickstarts/kick40068.A4000.RTB b/whdboot/boot-data/Devs/Kickstarts/kick40068.A4000.RTB
new file mode 100755
index 00000000..b8c64be1
Binary files /dev/null and b/whdboot/boot-data/Devs/Kickstarts/kick40068.A4000.RTB differ
diff --git a/whdboot/boot-data/Devs/system-configuration b/whdboot/boot-data/Devs/system-configuration
new file mode 100755
index 00000000..f7b77c40
Binary files /dev/null and b/whdboot/boot-data/Devs/system-configuration differ
diff --git a/whdboot/boot-data/Libs/68040.library b/whdboot/boot-data/Libs/68040.library
new file mode 100755
index 00000000..099b7f33
Binary files /dev/null and b/whdboot/boot-data/Libs/68040.library differ
diff --git a/whdboot/boot-data/Libs/amigaguide.library b/whdboot/boot-data/Libs/amigaguide.library
new file mode 100755
index 00000000..41034598
Binary files /dev/null and b/whdboot/boot-data/Libs/amigaguide.library differ
diff --git a/whdboot/boot-data/Libs/amos.library b/whdboot/boot-data/Libs/amos.library
new file mode 100755
index 00000000..8efe9082
Binary files /dev/null and b/whdboot/boot-data/Libs/amos.library differ
diff --git a/whdboot/boot-data/Libs/asl.library b/whdboot/boot-data/Libs/asl.library
new file mode 100755
index 00000000..172c80c9
Binary files /dev/null and b/whdboot/boot-data/Libs/asl.library differ
diff --git a/whdboot/boot-data/Libs/datatypes.library b/whdboot/boot-data/Libs/datatypes.library
new file mode 100755
index 00000000..813fed0a
Binary files /dev/null and b/whdboot/boot-data/Libs/datatypes.library differ
diff --git a/whdboot/boot-data/Libs/diskfont.library b/whdboot/boot-data/Libs/diskfont.library
new file mode 100755
index 00000000..7ec4b02c
Binary files /dev/null and b/whdboot/boot-data/Libs/diskfont.library differ
diff --git a/whdboot/boot-data/Libs/explode.library b/whdboot/boot-data/Libs/explode.library
new file mode 100755
index 00000000..0ca4a794
Binary files /dev/null and b/whdboot/boot-data/Libs/explode.library differ
diff --git a/whdboot/boot-data/Libs/iff.library b/whdboot/boot-data/Libs/iff.library
new file mode 100755
index 00000000..9e63ee8d
Binary files /dev/null and b/whdboot/boot-data/Libs/iff.library differ
diff --git a/whdboot/boot-data/Libs/iffparse.library b/whdboot/boot-data/Libs/iffparse.library
new file mode 100755
index 00000000..1a3a31f1
Binary files /dev/null and b/whdboot/boot-data/Libs/iffparse.library differ
diff --git a/whdboot/boot-data/Libs/lowlevel.library b/whdboot/boot-data/Libs/lowlevel.library
new file mode 100755
index 00000000..69e5ac27
Binary files /dev/null and b/whdboot/boot-data/Libs/lowlevel.library differ
diff --git a/whdboot/boot-data/Libs/mathieeedoubbas.library b/whdboot/boot-data/Libs/mathieeedoubbas.library
new file mode 100755
index 00000000..9264dec6
Binary files /dev/null and b/whdboot/boot-data/Libs/mathieeedoubbas.library differ
diff --git a/whdboot/boot-data/Libs/mathieeedoubtrans.library b/whdboot/boot-data/Libs/mathieeedoubtrans.library
new file mode 100755
index 00000000..ac60525f
Binary files /dev/null and b/whdboot/boot-data/Libs/mathieeedoubtrans.library differ
diff --git a/whdboot/boot-data/Libs/mathieeesingtrans.library b/whdboot/boot-data/Libs/mathieeesingtrans.library
new file mode 100755
index 00000000..6229ff1c
Binary files /dev/null and b/whdboot/boot-data/Libs/mathieeesingtrans.library differ
diff --git a/whdboot/boot-data/Libs/mathtrans.library b/whdboot/boot-data/Libs/mathtrans.library
new file mode 100755
index 00000000..a4a2ee96
Binary files /dev/null and b/whdboot/boot-data/Libs/mathtrans.library differ
diff --git a/whdboot/boot-data/Libs/medplayer.library b/whdboot/boot-data/Libs/medplayer.library
new file mode 100755
index 00000000..ed30bda3
Binary files /dev/null and b/whdboot/boot-data/Libs/medplayer.library differ
diff --git a/whdboot/boot-data/Libs/nonvolatile.library b/whdboot/boot-data/Libs/nonvolatile.library
new file mode 100755
index 00000000..efee774d
Binary files /dev/null and b/whdboot/boot-data/Libs/nonvolatile.library differ
diff --git a/whdboot/boot-data/Libs/xpkmaster.library b/whdboot/boot-data/Libs/xpkmaster.library
new file mode 100755
index 00000000..e007ee92
Binary files /dev/null and b/whdboot/boot-data/Libs/xpkmaster.library differ
diff --git a/whdboot/boot-data/S/startup-sequence b/whdboot/boot-data/S/startup-sequence
new file mode 100755
index 00000000..3c2b77d0
--- /dev/null
+++ b/whdboot/boot-data/S/startup-sequence
@@ -0,0 +1,95 @@
+C:Assign ENV: RAM: >nil:
+C:Assign T: RAM: >nil:
+C:Assign PROGDIR: C: >nil:
+
+Resident C:WHDLoad PURE
+Echo ""
+
+
+; ======================
+IF EXISTS C:SetPatch
+   C:SetPatch > NIL:
+ENDIF
+
+
+
+; ====================== Set path
+info >t:tempfile DH1:
+search >nil: t:tempfile "[Mounted]"
+
+if not warn
+	Assign WHDLoadGame: DH1:
+	echo "WHDLoadGame: will be mapped to DH1:"
+	Echo ""
+else
+  	Assign WHDLoadGame: DH0:
+	echo "WHDLoadGame: will be mapped to DH0:"
+	Echo ""
+endif
+
+
+
+; ======================  
+
+ C:GetMouseInput Local
+ IF $MouseInput EQ 1
+    Echo "Left Mouse Button held. Force creation of new Auto-Startup file"
+    Echo ""
+ ELSE
+
+ SET Reply `C:joytest 1 0`
+ IF $Reply EQ "(Fire-1)"
+     Echo "Joystick Fire held. Force creation of new Auto-Startup file"
+     Echo ""
+
+ ELSE
+    Echo "Scan for auto-startup and debugging messages..."
+
+    cd :WHDbooter/
+    Find_AutoStartup.exe
+
+    Echo "Scan done"
+    Echo ""
+
+ ENDIF
+ ENDIF
+
+
+; ======= did we create a file earlier?
+IF EXISTS T:auto-startup
+     Echo ""
+ELSE
+    cd :WHDbooter/
+    GameBootLoader.exe scanpath=WHDLoadGame: only usefolderpath
+ENDIF
+
+
+; ======================
+;IF EXISTS :WHDbooter/SplashScreen.exe
+;   cd :WHDbooter
+;   :WHDbooter/SplashScreen.exe >NIL:
+;ELSE
+;   c:TUDE hardreset >nil:
+;ENDIF
+
+
+
+
+; +++ RUN IT
+
+IF EXISTS T:auto-startup
+   Echo "Execute the Auto-Startup boot script."
+   Echo ""
+   c:execute T:auto-startup
+ELSE
+   echo "Error: There is still no Auto-Startup boot script."
+
+ENDIF
+
+
+;   c:TUDE hardreset >nil:
+
+
+
+
+
diff --git a/whdboot/boot-data/S/whdload.prefs b/whdboot/boot-data/S/whdload.prefs
new file mode 100755
index 00000000..f69f4c0a
--- /dev/null
+++ b/whdboot/boot-data/S/whdload.prefs
@@ -0,0 +1,32 @@
+;
+; global configuration file for WHDLoad
+; searched as "S:whdload.prefs"
+;
+; CLI-Arguments and ToolTypes will overwrite these !
+;
+
+NoWriteCache        		;disable the disk write cache
+QuitKey=$5a         		;rawkey code to quit
+SplashDelay=0     		;time to display splash window (1/50 seconds)
+SavePath=dh0:WHDBooter/Savegames/
+
+;ButtonWait      	 	;wait for button pressed (slave must support this)
+;ChipNoCache         		;disable cachebility of Chip-Memory
+;CoreDumpPath=T:     		;path for coredump files
+;DebugKey=$5b        		;rawkey code to quit with coredump (debug)
+;ExecuteStartup=rx offline.rexx  ;command to execute on WHDLoad startup
+;ExecuteCleanup=rx online.rexx   ;command to execute on WHDLoad exit
+;Expert           ;selects expert mode
+;FreezeKey=$5d       ;rawkey code to enter HrtMon/TK
+;MMU           ;use MMU (for 68030)
+;NoAutoVec        ;ignore unwanted autovector interrupts
+;NoFilter         ;disable audio filter
+;NoFlushMem       ;do not flush memory
+;NoMemReverse        ;do not allocate memory reverse
+;ReadDelay=150       ;wait after reading from disk (1/50 seconds)
+;RestartKey=$5c         ;rawkey code to restart
+;ShowRegs=SYS:Utilities/MuchMore W WL=80 WT=80 WW=582 WH=700   ;command for Show Regs
+;WriteDelay=150         ;wait after saving something to disk (1/50 seconds)
+
+
+
diff --git a/whdboot/boot-data/WHDBooter/Splash/intro_000.iff b/whdboot/boot-data/WHDBooter/Splash/intro_000.iff
new file mode 100755
index 00000000..bf6a621f
Binary files /dev/null and b/whdboot/boot-data/WHDBooter/Splash/intro_000.iff differ
diff --git a/whdboot/boot-data/WHDBooter/Splash/titlesound b/whdboot/boot-data/WHDBooter/Splash/titlesound
new file mode 100755
index 00000000..ad3af703
Binary files /dev/null and b/whdboot/boot-data/WHDBooter/Splash/titlesound differ
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/1943.ws b/whdboot/boot-data/WHDBooter/WSConfigs/1943.ws
new file mode 100755
index 00000000..2363a01c
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/1943.ws
@@ -0,0 +1 @@
+C1:B:Infinite Lives;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/AfterBurnerActivision.ws b/whdboot/boot-data/WHDBooter/WSConfigs/AfterBurnerActivision.ws
new file mode 100755
index 00000000..692555c4
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/AfterBurnerActivision.ws
@@ -0,0 +1,2 @@
+C1:B:Infinite Lives;
+C2:B:Infinite Missiles;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed2.ws b/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed2.ws
new file mode 100755
index 00000000..d918d494
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed2.ws
@@ -0,0 +1 @@
+C1:B:Infinite Energy & Lives;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed3D.ws b/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed3D.ws
new file mode 100755
index 00000000..54e5400d
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed3D.ws
@@ -0,0 +1,4 @@
+C1:B:Enable Trainers:0;
+C2:L:Mouse Control Mode:None,LMB forward / RMB fire,LMB fire / RMB forward;
+C3:B:Load Aminet Version (abd8ch):0;
+C4:B:Enable main music at the end (HackAB3D):0;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed3Ddemo.ws b/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed3Ddemo.ws
new file mode 100755
index 00000000..51a2d4d0
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/AlienBreed3Ddemo.ws
@@ -0,0 +1,2 @@
+C1:C:Enable Trainers;
+C2:X:Load Rolling Demo;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/CarVup.ws b/whdboot/boot-data/WHDBooter/WSConfigs/CarVup.ws
new file mode 100755
index 00000000..d34f75d2
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/CarVup.ws
@@ -0,0 +1,3 @@
+C1:X:Enable in-game Trainers;
+C2:X:Enable CD32 Controls;
+
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/Cybernoid 2.ws b/whdboot/boot-data/WHDBooter/WSConfigs/Cybernoid 2.ws
new file mode 100755
index 00000000..4f81e93c
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/Cybernoid 2.ws	
@@ -0,0 +1,6 @@
+C1:X:Infinite Lives:0;
+C1:X:Infinite Weapons:1;
+C1:X:Infinite Level Timer:2;
+C1:X:Infinite Screen Timer:3;
+C1:X:Enable Level Skip:4;
+C2:B:Infinite Enable CD32 Controls;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/Cybernoid.ws b/whdboot/boot-data/WHDBooter/WSConfigs/Cybernoid.ws
new file mode 100755
index 00000000..4f81e93c
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/Cybernoid.ws
@@ -0,0 +1,6 @@
+C1:X:Infinite Lives:0;
+C1:X:Infinite Weapons:1;
+C1:X:Infinite Level Timer:2;
+C1:X:Infinite Screen Timer:3;
+C1:X:Enable Level Skip:4;
+C2:B:Infinite Enable CD32 Controls;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/DalekAttack.ws b/whdboot/boot-data/WHDBooter/WSConfigs/DalekAttack.ws
new file mode 100755
index 00000000..45875569
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/DalekAttack.ws
@@ -0,0 +1,2 @@
+C1:X:Player 1 Unlimited Lives;
+C2:X:Player 2 Unlimited Lives ?;
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/Exile.ws b/whdboot/boot-data/WHDBooter/WSConfigs/Exile.ws
new file mode 100755
index 00000000..9ce789e5
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/Exile.ws
@@ -0,0 +1 @@
+C1:B:Faster Boot Option;
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/Flaschbier.ws b/whdboot/boot-data/WHDBooter/WSConfigs/Flaschbier.ws
new file mode 100755
index 00000000..9a664826
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/Flaschbier.ws
@@ -0,0 +1,2 @@
+C1:X:Skip Intro;
+C2:L:Select Speed:Fast,Normal,Slow;
\ No newline at end of file
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/Gauntlet 2.ws b/whdboot/boot-data/WHDBooter/WSConfigs/Gauntlet 2.ws
new file mode 100755
index 00000000..9ce789e5
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/Gauntlet 2.ws	
@@ -0,0 +1 @@
+C1:B:Faster Boot Option;
diff --git a/whdboot/boot-data/WHDBooter/WSConfigs/SuperCars 2.ws b/whdboot/boot-data/WHDBooter/WSConfigs/SuperCars 2.ws
new file mode 100755
index 00000000..491f9997
--- /dev/null
+++ b/whdboot/boot-data/WHDBooter/WSConfigs/SuperCars 2.ws	
@@ -0,0 +1,3 @@
+C1:X:Activate Original Cheat;
+C2:L:Select Track:None,Track 1,Track 2,Track 3,Track 4,Track 5,Track 6,Track 7;
+C3:X:Raise Panel (NTSC);
\ No newline at end of file
diff --git a/whdboot/hostprefs.conf b/whdboot/hostprefs.conf
new file mode 100755
index 00000000..660d0e38
--- /dev/null
+++ b/whdboot/hostprefs.conf
@@ -0,0 +1,7 @@
+stereo_seperation=1
+key_for_menu=F12
+key_for_quit=F11
+gfx_correct_aspect=False
+gfx_framerate=0
+controller_1=joy0
+controller_2=joy1
\ No newline at end of file