Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Inc/MenuStructs.inc
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Inc/MenuStructs.inc	(revision 594)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Inc/MenuStructs.inc	(revision 596)
@@ -38,21 +38,21 @@
 
 struc MENUPAGE
-	.fnEnter			resb	2	; Function to initialize MENUPAGE
-	.fnBack				resb	2	; Function to initialize previous MENUPAGE
-	.wMenuitems			resb	2	; Number of MENUITEM structs
-	.rgMenuitem:					; All MENUITEM structs in this MENUPAGE
+	.fnEnter				resb	2	; Function to initialize MENUPAGE
+	.fnBack					resb	2	; Function to initialize previous MENUPAGE
+	.wMenuitems				resb	2	; Number of MENUITEM structs
+	.rgMenuitem:						; All MENUITEM structs in this MENUPAGE
 endstruc
 
 struc MENUITEM
-	.fnActivate			resb	2	; Offset to item activation function
-	.fnFormatValue		resb	2	; Offset to item value formatting function
+	.fnActivate				resb	2	; Offset to item activation function
+	.fnFormatValue			resb	2	; Offset to item value formatting function
 
-	.szName				resb	2	; Offset to item name string
-	.szQuickInfo		resb	2	; Offset to item quick information string
-	.szHelp				resb	2	; Offset to item help string
+	.szName					resb	2	; Offset to item name string
+	.szQuickInfo			resb	2	; Offset to item quick information string
+	.szHelp					resb	2	; Offset to item help string
 
-	.bFlags				resb	1	; Item flags
-	.bType				resb	1	; Item type
-	.itemValue			resb	ITEM_VALUE_size		; ITEM_VALUE for automated item handling
+	.bFlags					resb	1	; Item flags
+	.bType					resb	1	; Item type
+	.itemValue				resb	ITEM_VALUE_size		; ITEM_VALUE for automated item handling
 endstruc
 
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/BiosFile.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/BiosFile.asm	(revision 594)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/BiosFile.asm	(revision 596)
@@ -40,6 +40,6 @@
 	jc		SHORT .DisplayErrorMessage
 
-	mov		ax, FLG_CFGVARS_FILELOADED
-	call	Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration
+	mov		al, FLG_CFGVARS_FILELOADED
+	call	Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration
 	call	FileIO_CloseUsingHandleFromBX
 	call	DisplayFileLoadedSuccessfully
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Buffers.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Buffers.asm	(revision 594)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Buffers.asm	(revision 596)
@@ -109,5 +109,5 @@
 
 ;--------------------------------------------------------------------
-; Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration
+; Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration
 ;	Parameters:
 ;		AL:		EEPROM source (FLG_CFGVARS_FILELOADED or FLG_CFGVARS_ROMLOADED)
@@ -119,5 +119,5 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration:
+Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration:
 	and		BYTE [cs:g_cfgVars+CFGVARS.wFlags], ~(FLG_CFGVARS_FILELOADED | FLG_CFGVARS_ROMLOADED | FLG_CFGVARS_UNSAVED)
 	or		[cs:g_cfgVars+CFGVARS.wFlags], al
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Flash.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Flash.asm	(revision 594)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Flash.asm	(revision 596)
@@ -296,5 +296,5 @@
 
 ;--------------------------------------------------------------------
-; WaitUntilEepromPageWriteHasCompleted
+; .WaitUntilEepromPageWriteHasCompleted
 ;	Parameters:
 ;		SS:BP:	Ptr to FLASHVARS
Index: trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm
===================================================================
--- trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm	(revision 594)
+++ trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/MainMenu.asm	(revision 596)
@@ -258,5 +258,4 @@
 	call	BiosFile_LoadFileFromDSSItoRamBuffer
 	call	LoadColorTheme
-	; *FIXME* Will load themes even from unrecognized versions of the BIOS which isn't really a problem but still 'unexpected behaviour' and therefore a bug.
 	call	MainMenu_EnterMenuOrModifyItemVisibility
 .CancelFileLoading:
@@ -270,6 +269,6 @@
 	call	Buffers_SaveChangesIfFileLoaded
 	call	EEPROM_LoadXtideUniversalBiosFromRomToRamBufferAndReturnSizeInDXCX
-	mov		ax, FLG_CFGVARS_ROMLOADED
-	call	Buffers_NewBiosWithSizeInDXCXandSourceInAXhasBeenLoadedForConfiguration
+	mov		al, FLG_CFGVARS_ROMLOADED
+	call	Buffers_NewBiosWithSizeInDXCXandSourceInALhasBeenLoadedForConfiguration
 	mov		dx, g_szDlgMainLoadROM
 	call	Dialogs_DisplayNotificationFromCSDX
@@ -297,11 +296,15 @@
 ;		Nothing
 ;	Corrupts registers:
-;		AX, BX, DI, ES
+;		AX, BX, CX, SI, DI, ES
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
 LoadColorTheme:
 	call	Buffers_GetFileBufferToESDI
+	call	Buffers_IsXtideUniversalBiosSignatureInESDI
+	jnz		SHORT .Return
 .FromROM:
 	mov		ax, [es:ROMVARS.pColorTheme]
 	jmp		ReadColorTheme
-
+.Return:
+	ret
+
