--- a/GUI/GUIWindow.h	Sun May 10 01:29:11 2015 +0200
+++ b/GUI/GUIWindow.h	Sun May 10 02:04:52 2015 +0200
@@ -267,7 +267,7 @@
 {
   WINDOW_null            = 0,
   WINDOW_MainMenu        = 1,
-  WINDOW_OptionsButtons  = 3,
+  WINDOW_GameMenu  = 3,
   WINDOW_CharacterRecord = 4,
   WINDOW_Options         = 6,
   WINDOW_8               = 8,
@@ -390,32 +390,36 @@
 
 enum CURRENT_SCREEN
 {
-  SCREEN_GAME = 0x0,
-  SCREEN_MENU = 0x1,
-  SCREEN_OPTIONS = 0x2,
-  SCREEN_BOOKS = 0x3,
-  SCREEN_NPC_DIALOGUE = 0x4,
-  SCREEN_REST = 0x5,
+  SCREEN_GAME = 0,
+  SCREEN_MENU = 1,
+  SCREEN_OPTIONS = 2,
+  SCREEN_BOOKS = 3,
+  SCREEN_NPC_DIALOGUE = 4,
+  SCREEN_REST = 5,
+  SCREEN_6 = 6,
   SCREEN_CHARACTERS = 7,
-  SCREEN_SPELL_BOOK = 0x8,
-  SCREEN_CREATORS = 0x9,
+  SCREEN_SPELL_BOOK = 8,
+  SCREEN_CREATORS = 9,
   SCREEN_CHEST = 10,
   SCREEN_SAVEGAME = 11,
   SCREEN_LOADGAME = 12,
   SCREEN_HOUSE = 13,
   SCREEN_E = 14,
   SCREEN_CHEST_INVENTORY = 15,
-  SCREEN_VIDEO = 0x10,
-  SCREEN_CHANGE_LOCATION = 0x11,
-  SCREEN_INPUT_BLV = 0x12,
-  SCREEN_BRANCHLESS_NPC_DIALOG = 0x13,
-  SCREEN_PARTY_CREATION = 0x15,
-  SCREEN_MODAL_WINDOW = 0x16,
-  SCREEN_CASTING = 0x17,
-  SCREEN_19 = 0x19,
-  SCREEN_KEYBOARD_OPTIONS = 0x1A,
-  SCREEN_1B = 0x1B,
-  SCREEN_VIDEO_OPTIONS = 0x1C,
+  SCREEN_VIDEO = 16,
+  SCREEN_CHANGE_LOCATION = 17,
+  SCREEN_INPUT_BLV = 18,
+  SCREEN_BRANCHLESS_NPC_DIALOG = 19,
+  SCREEN_20 = 20,
+  SCREEN_PARTY_CREATION = 21,
+  SCREEN_MODAL_WINDOW = 22,
+  SCREEN_CASTING = 23,
+  SCREEN_24 = 24,
+  SCREEN_19 = 25,
+  SCREEN_KEYBOARD_OPTIONS = 26,
+  SCREEN_1B = 27,
+  SCREEN_VIDEO_OPTIONS = 28,
+
   SCREEN_63 = 0x63,
   SCREEN_64 = 0x64,
   SCREEN_67 = 0x67,
@@ -524,12 +528,16 @@
 
 
 // game menu ui
-void GameMenuUI_DrawKeyBindings();
-void GameMenuUI_DrawVideoOptions();
+GUIWindow *GameMenuUI_Load();
+
 GUIWindow *GameMenuUI_Options_Load();
+void GameMenuUI_Options_Draw();
+
 GUIWindow *GameMenuUI_OptionsKeymapping_Load();
+void GameMenuUI_DrawKeyBindings();
+
 GUIWindow *GameMenuUI_OptionsVideo_Load();
-void GameMenuUI_Options_Draw();
+void GameMenuUI_DrawVideoOptions();