--- hatari/src/includes/configuration.h	2019/04/01 07:11:30	1.1.1.4
+++ hatari/src/includes/configuration.h	2019/04/01 07:11:51	1.1.1.5
@@ -9,14 +9,12 @@
 #define HATARI_CONFIGURATION_H
 
 
-/* TOS/GEM configuration */
+/* ROM (TOS + cartridge) configuration */
 typedef struct
 {
-  char szTOSImageFileName[FILENAME_MAX];
-  BOOL bUseExtGEMResolutions;
-  int nGEMResolution;
-  int nGEMColours;
-} CNF_TOSGEM;
+  char szTosImageFileName[FILENAME_MAX];
+  char szCartridgeImageFileName[FILENAME_MAX];
+} CNF_ROM;
 
 
 /* Sound configuration */
@@ -135,15 +133,16 @@ typedef struct
 typedef struct
 {
   BOOL bFullScreen;
-  BOOL bDoubleSizeWindow;
-  BOOL bAllowOverscan;
-  BOOL bInterlacedScreen;
-  BOOL bSyncToRetrace;
   BOOL bFrameSkip;
+  BOOL bAllowOverscan;
+  BOOL bInterleavedScreen;
   int ChosenDisplayMode;
+  BOOL bUseHighRes;
+  BOOL bUseExtVdiResolutions;
+  int nVdiResolution;
+  int nVdiColors;
   BOOL bCaptureChange;
   int nFramesPerSecond;
-  BOOL bUseHighRes;
 } CNF_SCREEN;
 
 
@@ -198,7 +197,7 @@ typedef struct
   CNF_MEMORY Memory;
   CNF_DISCIMAGE DiscImage;
   CNF_HARDDISC HardDisc;
-  CNF_TOSGEM TOSGEM;
+  CNF_ROM Rom;
   CNF_RS232 RS232;
   CNF_PRINTER Printer;
   CNF_MIDI Midi;
@@ -211,6 +210,7 @@ extern CNF_PARAMS ConfigureParams;
 extern char sConfigFileName[FILENAME_MAX];
 
 extern void Configuration_SetDefault(void);
+extern void Configuration_WorkOnDetails(BOOL bReset);
 extern void Configuration_Load(void);
 extern void Configuration_Save(void);