diff --git a/Grafx2.xcodeproj/project.pbxproj b/Grafx2.xcodeproj/project.pbxproj
index 8b96b815..6d19cc04 100644
--- a/Grafx2.xcodeproj/project.pbxproj
+++ b/Grafx2.xcodeproj/project.pbxproj
@@ -29,18 +29,11 @@
 		F5AFA0100EFAC7D300663B43 /* pxwide.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA00A0EFAC7D300663B43 /* pxwide.c */; };
 		F5AFA0110EFAC7D300663B43 /* setup.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA00B0EFAC7D300663B43 /* setup.c */; };
 		F5AFA0120EFAC7D300663B43 /* windows.c in Sources */ = {isa = PBXBuildFile; fileRef = F5AFA00C0EFAC7D300663B43 /* windows.c */; };
-		F5B138940EB71977000B83CC /* texte.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B138930EB71977000B83CC /* texte.c */; };
 		F5B138C30EB71D28000B83CC /* SDL_ttf in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138C20EB71D28000B83CC /* SDL_ttf */; };
-		F5B19B8D0EA4BE3E003F4BA4 /* aide.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B750EA4BE3E003F4BA4 /* aide.c */; };
-		F5B19B8E0EA4BE3E003F4BA4 /* boutons.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B760EA4BE3E003F4BA4 /* boutons.c */; };
-		F5B19B8F0EA4BE3E003F4BA4 /* clavier.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B770EA4BE3E003F4BA4 /* clavier.c */; };
-		F5B19B900EA4BE3E003F4BA4 /* divers.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B780EA4BE3E003F4BA4 /* divers.c */; };
-		F5B19B910EA4BE3E003F4BA4 /* files.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B790EA4BE3E003F4BA4 /* files.c */; };
 		F5B19B930EA4BE3E003F4BA4 /* graph.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7B0EA4BE3E003F4BA4 /* graph.c */; };
 		F5B19B940EA4BE3E003F4BA4 /* init.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7C0EA4BE3E003F4BA4 /* init.c */; };
 		F5B19B950EA4BE3E003F4BA4 /* io.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7D0EA4BE3E003F4BA4 /* io.c */; };
 		F5B19B970EA4BE3E003F4BA4 /* loadsave.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */; };
-		F5B19B980EA4BE3E003F4BA4 /* moteur.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B800EA4BE3E003F4BA4 /* moteur.c */; };
 		F5B19B9A0EA4BE3E003F4BA4 /* op_c.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B820EA4BE3E003F4BA4 /* op_c.c */; };
 		F5B19B9B0EA4BE3E003F4BA4 /* operatio.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B830EA4BE3E003F4BA4 /* operatio.c */; };
 		F5B19B9C0EA4BE3E003F4BA4 /* pages.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B840EA4BE3E003F4BA4 /* pages.c */; };
@@ -53,10 +46,18 @@
 		F5B19BA30EA4BE3E003F4BA4 /* shade.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B8B0EA4BE3E003F4BA4 /* shade.c */; };
 		F5B19BA40EA4BE3E003F4BA4 /* special.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B19B8C0EA4BE3E003F4BA4 /* special.c */; };
 		F5B19BE10EA4C65A003F4BA4 /* gfx2.cfg in Resources */ = {isa = PBXBuildFile; fileRef = F5B19BDF0EA4C65A003F4BA4 /* gfx2.cfg */; };
+		F5B19BE10EA4C65A003F4BA5 /* base.gif in Copy skins */ = {isa = PBXBuildFile; fileRef = F5B19BDF0EA4C65A003F4BA5 /* base.gif */; };
+		F5B19BE10EA4C65A003F4BA6 /* ilkke.png in Copy skins */ = {isa = PBXBuildFile; fileRef = F5B19BDF0EA4C65A003F4BA6 /* ilkke.png */; };
 		F5B19C1D0EA4D71C003F4BA4 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */; };
 		F5B19C3D0EA4DC91003F4BA4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F5B19C3B0EA4DC91003F4BA4 /* InfoPlist.strings */; };
 		F5B1EE850EAD0F4E00B087B5 /* gfx2def.ini in Resources */ = {isa = PBXBuildFile; fileRef = F5B1EE840EAD0F4E00B087B5 /* gfx2def.ini */; };
-		F5B1EE850EAD0F4E00B087B6 /* gfx2gui.gif in Resources */ = {isa = PBXBuildFile; fileRef = F5B1EE840EAD0F4E00B087B6 /* gfx2gui.gif */; };
+		F5B310B40F949A9C008197E2 /* buttons.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B310AD0F949A9C008197E2 /* buttons.c */; };
+		F5B310B50F949A9C008197E2 /* engine.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B310AE0F949A9C008197E2 /* engine.c */; };
+		F5B310B60F949A9C008197E2 /* filesel.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B310AF0F949A9C008197E2 /* filesel.c */; };
+		F5B310B70F949A9C008197E2 /* help.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B310B00F949A9C008197E2 /* help.c */; };
+		F5B310B80F949A9C008197E2 /* keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B310B10F949A9C008197E2 /* keyboard.c */; };
+		F5B310B90F949A9C008197E2 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B310B20F949A9C008197E2 /* misc.c */; };
+		F5B310BA0F949A9C008197E2 /* text.c in Sources */ = {isa = PBXBuildFile; fileRef = F5B310B30F949A9C008197E2 /* text.c */; };
 		F5CDCE320F6EA6D600B31F63 /* pxdouble.c in Sources */ = {isa = PBXBuildFile; fileRef = F5CDCE310F6EA6D600B31F63 /* pxdouble.c */; };
 		F5DCE2BC0EA5116A0065B0EF /* SDL_ttf in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = F5DCE2BE0EA5118F0065B0EF /* SDL_ttf */; };
 		F5DCE2BC0EA5116B0065B0EF /* SDL_image in Copy Frameworks into .app bundle */ = {isa = PBXBuildFile; fileRef = F5DCE2BB0EA5116B0065B0EF /* SDL_image */; };
@@ -112,6 +113,18 @@
 			name = "Copy fonts";
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		F5A33F1D0EC8A26C00F8052E /* Copy skins */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = skins;
+			dstSubfolderSpec = 7;
+			files = (
+				F5B19BE10EA4C65A003F4BA5 /* base.gif in Copy skins */,
+				F5B19BE10EA4C65A003F4BA6 /* ilkke.png in Copy skins */,
+			);
+			name = "Copy skins";
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
@@ -143,20 +156,12 @@
 		F5AFA00A0EFAC7D300663B43 /* pxwide.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxwide.c; sourceTree = "<group>"; };
 		F5AFA00B0EFAC7D300663B43 /* setup.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = setup.c; sourceTree = "<group>"; };
 		F5AFA00C0EFAC7D300663B43 /* windows.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = windows.c; sourceTree = "<group>"; };
-		F5B138930EB71977000B83CC /* texte.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = texte.c; sourceTree = "<group>"; };
 		F5B138C20EB71D28000B83CC /* SDL_ttf */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_ttf; path = /Library/Frameworks/SDL_ttf.framework/SDL_ttf; sourceTree = "<absolute>"; };
 		F5B19B6C0EA4BDA8003F4BA4 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = /Library/Frameworks/SDL_image.framework; sourceTree = "<absolute>"; };
-		F5B19B750EA4BE3E003F4BA4 /* aide.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = aide.c; sourceTree = "<group>"; };
-		F5B19B760EA4BE3E003F4BA4 /* boutons.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = boutons.c; sourceTree = "<group>"; };
-		F5B19B770EA4BE3E003F4BA4 /* clavier.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = clavier.c; sourceTree = "<group>"; };
-		F5B19B780EA4BE3E003F4BA4 /* divers.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = divers.c; sourceTree = "<group>"; };
-		F5B19B790EA4BE3E003F4BA4 /* files.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = files.c; sourceTree = "<group>"; };
-		F5B19B7A0EA4BE3E003F4BA4 /* gfxcfg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = gfxcfg.c; sourceTree = "<group>"; };
 		F5B19B7B0EA4BE3E003F4BA4 /* graph.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = graph.c; sourceTree = "<group>"; };
 		F5B19B7C0EA4BE3E003F4BA4 /* init.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = init.c; sourceTree = "<group>"; };
 		F5B19B7D0EA4BE3E003F4BA4 /* io.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = io.c; sourceTree = "<group>"; };
 		F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = loadsave.c; sourceTree = "<group>"; };
-		F5B19B800EA4BE3E003F4BA4 /* moteur.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = moteur.c; sourceTree = "<group>"; };
 		F5B19B820EA4BE3E003F4BA4 /* op_c.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = op_c.c; sourceTree = "<group>"; };
 		F5B19B830EA4BE3E003F4BA4 /* operatio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = operatio.c; sourceTree = "<group>"; };
 		F5B19B840EA4BE3E003F4BA4 /* pages.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pages.c; sourceTree = "<group>"; };
@@ -169,10 +174,18 @@
 		F5B19B8B0EA4BE3E003F4BA4 /* shade.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = shade.c; sourceTree = "<group>"; };
 		F5B19B8C0EA4BE3E003F4BA4 /* special.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = special.c; sourceTree = "<group>"; };
 		F5B19BDF0EA4C65A003F4BA4 /* gfx2.cfg */ = {isa = PBXFileReference; lastKnownFileType = file; path = gfx2.cfg; sourceTree = "<group>"; };
+		F5B19BDF0EA4C65A003F4BA5 /* base.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = base.gif; path = skins/base.gif; sourceTree = "<group>"; };
+		F5B19BDF0EA4C65A003F4BA6 /* ilkke.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ilkke.png; path = skins/ilkke.png; sourceTree = "<group>"; };
 		F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/CoreFoundation.framework; sourceTree = SYSTEM_DEVELOPER_DIR; };
 		F5B19C3C0EA4DC91003F4BA4 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		F5B1EE840EAD0F4E00B087B5 /* gfx2def.ini */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = gfx2def.ini; sourceTree = "<group>"; };
-		F5B1EE840EAD0F4E00B087B6 /* gfx2gui.gif */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = gfx2gui.gif; sourceTree = "<group>"; };
+		F5B310AD0F949A9C008197E2 /* buttons.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = buttons.c; sourceTree = "<group>"; };
+		F5B310AE0F949A9C008197E2 /* engine.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = engine.c; sourceTree = "<group>"; };
+		F5B310AF0F949A9C008197E2 /* filesel.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = filesel.c; sourceTree = "<group>"; };
+		F5B310B00F949A9C008197E2 /* help.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = help.c; sourceTree = "<group>"; };
+		F5B310B10F949A9C008197E2 /* keyboard.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = keyboard.c; sourceTree = "<group>"; };
+		F5B310B20F949A9C008197E2 /* misc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = misc.c; sourceTree = "<group>"; };
+		F5B310B30F949A9C008197E2 /* text.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = text.c; sourceTree = "<group>"; };
 		F5CDCE310F6EA6D600B31F63 /* pxdouble.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = pxdouble.c; sourceTree = "<group>"; };
 		F5DCE2BB0EA5116B0065B0EF /* SDL_image */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL_image; path = /Library/Frameworks/SDL_image.framework/Versions/A/SDL_image; sourceTree = "<absolute>"; };
 		F5DCE2BD0EA5118E0065B0EF /* SDL */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = SDL; path = /Library/Frameworks/SDL.framework/Versions/A/SDL; sourceTree = "<absolute>"; };
@@ -253,9 +266,14 @@
 				F51CBD2D0EC8A3E1005C06AC /* Tuffy.ttf */,
 				F5A33E690EC893F800F8052D /* 8pxfont.png */,
 				F5B138C20EB71D28000B83CC /* SDL_ttf */,
-				F5B138930EB71977000B83CC /* texte.c */,
 				F5B1EE840EAD0F4E00B087B5 /* gfx2def.ini */,
-				F5B1EE840EAD0F4E00B087B6 /* gfx2gui.gif */,
+				F5B310AD0F949A9C008197E2 /* buttons.c */,
+				F5B310AE0F949A9C008197E2 /* engine.c */,
+				F5B310AF0F949A9C008197E2 /* filesel.c */,
+				F5B310B00F949A9C008197E2 /* help.c */,
+				F5B310B10F949A9C008197E2 /* keyboard.c */,
+				F5B310B20F949A9C008197E2 /* misc.c */,
+				F5B310B30F949A9C008197E2 /* text.c */,
 				F5AD4B1E0EA8CCF0009CCAC4 /* version.c */,
 				F5DCE2BD0EA5118E0065B0EF /* SDL */,
 				F5DCE2BB0EA5116B0065B0EF /* SDL_image */,
@@ -263,17 +281,12 @@
 				F5B19C3B0EA4DC91003F4BA4 /* InfoPlist.strings */,
 				F5B19C1C0EA4D71C003F4BA4 /* CoreFoundation.framework */,
 				F5B19BDF0EA4C65A003F4BA4 /* gfx2.cfg */,
-				F5B19B750EA4BE3E003F4BA4 /* aide.c */,
-				F5B19B760EA4BE3E003F4BA4 /* boutons.c */,
-				F5B19B770EA4BE3E003F4BA4 /* clavier.c */,
-				F5B19B780EA4BE3E003F4BA4 /* divers.c */,
-				F5B19B790EA4BE3E003F4BA4 /* files.c */,
-				F5B19B7A0EA4BE3E003F4BA4 /* gfxcfg.c */,
+				F5B19BDF0EA4C65A003F4BA5 /* base.gif */,
+				F5B19BDF0EA4C65A003F4BA6 /* ilkke.png */,
 				F5B19B7B0EA4BE3E003F4BA4 /* graph.c */,
 				F5B19B7C0EA4BE3E003F4BA4 /* init.c */,
 				F5B19B7D0EA4BE3E003F4BA4 /* io.c */,
 				F5B19B7F0EA4BE3E003F4BA4 /* loadsave.c */,
-				F5B19B800EA4BE3E003F4BA4 /* moteur.c */,
 				F5B19B820EA4BE3E003F4BA4 /* op_c.c */,
 				F5B19B830EA4BE3E003F4BA4 /* operatio.c */,
 				F5B19B840EA4BE3E003F4BA4 /* pages.c */,
@@ -335,6 +348,7 @@
 				002F39FD09D0883400EBEB89 /* Copy Frameworks into .app bundle */,
 				002F39FD09D0883400EBEB8A /* Copy Frameworks into .app bundle */,
 				F5A33F1D0EC8A26C00F8052D /* Copy fonts */,
+				F5A33F1D0EC8A26C00F8052E /* Copy skins */,
 			);
 			buildRules = (
 			);
@@ -369,7 +383,6 @@
 				F5B19BE10EA4C65A003F4BA4 /* gfx2.cfg in Resources */,
 				F5B19C3D0EA4DC91003F4BA4 /* InfoPlist.strings in Resources */,
 				F5B1EE850EAD0F4E00B087B5 /* gfx2def.ini in Resources */,
-				F5B1EE850EAD0F4E00B087B6 /* gfx2gui.gif in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -382,16 +395,10 @@
 			files = (
 				002F3A2E09D0888800EBEB88 /* SDLMain.m in Sources */,
 				002F3A3F09D088BA00EBEB88 /* main.c in Sources */,
-				F5B19B8D0EA4BE3E003F4BA4 /* aide.c in Sources */,
-				F5B19B8E0EA4BE3E003F4BA4 /* boutons.c in Sources */,
-				F5B19B8F0EA4BE3E003F4BA4 /* clavier.c in Sources */,
-				F5B19B900EA4BE3E003F4BA4 /* divers.c in Sources */,
-				F5B19B910EA4BE3E003F4BA4 /* files.c in Sources */,
 				F5B19B930EA4BE3E003F4BA4 /* graph.c in Sources */,
 				F5B19B940EA4BE3E003F4BA4 /* init.c in Sources */,
 				F5B19B950EA4BE3E003F4BA4 /* io.c in Sources */,
 				F5B19B970EA4BE3E003F4BA4 /* loadsave.c in Sources */,
-				F5B19B980EA4BE3E003F4BA4 /* moteur.c in Sources */,
 				F5B19B9A0EA4BE3E003F4BA4 /* op_c.c in Sources */,
 				F5B19B9B0EA4BE3E003F4BA4 /* operatio.c in Sources */,
 				F5B19B9C0EA4BE3E003F4BA4 /* pages.c in Sources */,
@@ -404,7 +411,6 @@
 				F5B19BA30EA4BE3E003F4BA4 /* shade.c in Sources */,
 				F5B19BA40EA4BE3E003F4BA4 /* special.c in Sources */,
 				F5AD4B1F0EA8CCF0009CCAC4 /* version.c in Sources */,
-				F5B138940EB71977000B83CC /* texte.c in Sources */,
 				F5AFA00D0EFAC7D300663B43 /* brush.c in Sources */,
 				F5AFA00E0EFAC7D300663B43 /* pxsimple.c in Sources */,
 				F5AFA00F0EFAC7D300663B43 /* pxtall.c in Sources */,
@@ -416,6 +422,13 @@
 				F5AC28BD0F4873C700455509 /* input.c in Sources */,
 				F5AC28BE0F4873C700455509 /* realpath.c in Sources */,
 				F5CDCE320F6EA6D600B31F63 /* pxdouble.c in Sources */,
+				F5B310B40F949A9C008197E2 /* buttons.c in Sources */,
+				F5B310B50F949A9C008197E2 /* engine.c in Sources */,
+				F5B310B60F949A9C008197E2 /* filesel.c in Sources */,
+				F5B310B70F949A9C008197E2 /* help.c in Sources */,
+				F5B310B80F949A9C008197E2 /* keyboard.c in Sources */,
+				F5B310B90F949A9C008197E2 /* misc.c in Sources */,
+				F5B310BA0F949A9C008197E2 /* text.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser
index 0452f338..8a2774d7 100644
--- a/Grafx2.xcodeproj/xx.pbxuser
+++ b/Grafx2.xcodeproj/xx.pbxuser
@@ -165,8 +165,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 259247013;
-			PBXWorkspaceStateSaveDate = 259247013;
+			PBXPerProjectTemplateStateSaveDate = 261403593;
+			PBXWorkspaceStateSaveDate = 261403593;
 		};
 		sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
 		userBuildSettings = {
@@ -192,14 +192,6 @@
 			sepNavWindowFrame = "{{15, 76}, {906, 665}}";
 		};
 	};
-	F5B138930EB71977000B83CC /* texte.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {932, 8455}}";
-			sepNavSelRange = "{2431, 70}";
-			sepNavVisRect = "{{0, 1377}, {867, 536}}";
-			sepNavWindowFrame = "{{67, 41}, {906, 665}}";
-		};
-	};
 	F5B19B5D0EA4BD57003F4BA4 /* Grafx2 */ = {
 		isa = PBXExecutable;
 		activeArgIndex = 2147483647;
@@ -246,36 +238,6 @@
 		objects = (
 		);
 	};
-	F5B19B750EA4BE3E003F4BA4 /* aide.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {964, 7904}}";
-			sepNavSelRange = "{1390, 0}";
-			sepNavVisRect = "{{0, 763}, {867, 536}}";
-			sepNavWindowFrame = "{{15, 76}, {906, 665}}";
-		};
-	};
-	F5B19B760EA4BE3E003F4BA4 /* boutons.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1260, 59470}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 0}, {867, 536}}";
-			sepNavWindowFrame = "{{15, 76}, {906, 665}}";
-		};
-	};
-	F5B19B780EA4BE3E003F4BA4 /* divers.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1636, 16435}}";
-			sepNavSelRange = "{24200, 0}";
-			sepNavVisRect = "{{0, 0}, {686, 59}}";
-		};
-	};
-	F5B19B790EA4BE3E003F4BA4 /* files.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1004, 12654}}";
-			sepNavSelRange = "{10408, 0}";
-			sepNavVisRect = "{{0, 5917}, {867, 536}}";
-		};
-	};
 	F5B19B7B0EA4BE3E003F4BA4 /* graph.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1620, 118579}}";
@@ -300,14 +262,6 @@
 			sepNavWindowFrame = "{{15, 76}, {906, 665}}";
 		};
 	};
-	F5B19B800EA4BE3E003F4BA4 /* moteur.c */ = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1420, 37772}}";
-			sepNavSelRange = "{371, 0}";
-			sepNavVisRect = "{{0, 516}, {867, 536}}";
-			sepNavWindowFrame = "{{38, 55}, {906, 665}}";
-		};
-	};
 	F5B19B850EA4BE3E003F4BA4 /* palette.c */ = {
 		uiCtxt = {
 			sepNavIntBoundsRect = "{{0, 0}, {1268, 37031}}";
diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective
index 1efbc4d9..f218db0c 100644
--- a/Grafx2.xcodeproj/xx.perspective
+++ b/Grafx2.xcodeproj/xx.perspective
@@ -440,6 +440,8 @@
 			<key>Layout</key>
 			<array>
 				<dict>
+					<key>BecomeActive</key>
+					<true/>
 					<key>ContentConfiguration</key>
 					<dict>
 						<key>PBXBottomSmartGroupGIDs</key>
@@ -473,11 +475,13 @@
 							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
 							<array>
 								<array>
+									<integer>57</integer>
+									<integer>55</integer>
 									<integer>0</integer>
 								</array>
 							</array>
 							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {418, 598}}</string>
+							<string>{{0, 506}, {418, 592}}</string>
 						</dict>
 						<key>PBXTopSmartGroupGIDs</key>
 						<array/>
@@ -487,14 +491,14 @@
 					<key>GeometryConfiguration</key>
 					<dict>
 						<key>Frame</key>
-						<string>{{0, 0}, {435, 616}}</string>
+						<string>{{0, 0}, {435, 610}}</string>
 						<key>GroupTreeTableConfiguration</key>
 						<array>
 							<string>MainColumn</string>
 							<real>418</real>
 						</array>
 						<key>RubberWindowFrame</key>
-						<string>-504 88 1487 657 0 0 1024 746 </string>
+						<string>52 -468 1092 651 0 0 1024 746 </string>
 					</dict>
 					<key>Module</key>
 					<string>PBXSmartGroupTreeModule</string>
@@ -531,9 +535,9 @@
 							<key>GeometryConfiguration</key>
 							<dict>
 								<key>Frame</key>
-								<string>{{0, 0}, {1047, 0}}</string>
+								<string>{{0, 0}, {652, 0}}</string>
 								<key>RubberWindowFrame</key>
-								<string>-504 88 1487 657 0 0 1024 746 </string>
+								<string>52 -468 1092 651 0 0 1024 746 </string>
 							</dict>
 							<key>Module</key>
 							<string>PBXNavigatorGroup</string>
@@ -542,16 +546,14 @@
 						</dict>
 						<dict>
 							<key>Proportion</key>
-							<string>611pt</string>
+							<string>605pt</string>
 							<key>Tabs</key>
 							<array>
 								<dict>
-									<key>BecomeActive</key>
-									<true/>
 									<key>ContentConfiguration</key>
 									<dict>
 										<key>PBXBuildLogShowsTranscriptDefaultKey</key>
-										<string>{{0, 15}, {1047, 569}}</string>
+										<string>{{0, 5}, {652, 573}}</string>
 										<key>PBXProjectModuleGUID</key>
 										<string>XCMainBuildResultsModuleGUID</string>
 										<key>PBXProjectModuleLabel</key>
@@ -564,9 +566,9 @@
 									<key>GeometryConfiguration</key>
 									<dict>
 										<key>Frame</key>
-										<string>{{10, 27}, {1047, 584}}</string>
+										<string>{{10, 27}, {652, 578}}</string>
 										<key>RubberWindowFrame</key>
-										<string>-504 88 1487 657 0 0 1024 746 </string>
+										<string>52 -468 1092 651 0 0 1024 746 </string>
 									</dict>
 									<key>Module</key>
 									<string>PBXBuildResultsModule</string>
@@ -628,7 +630,7 @@
 						</dict>
 					</array>
 					<key>Proportion</key>
-					<string>1047pt</string>
+					<string>652pt</string>
 				</dict>
 			</array>
 			<key>Name</key>
@@ -646,14 +648,14 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>F5B724900F73CBB1004960D2</string>
+				<string>F5F7346C0F94B3DD003FC65B</string>
 				<string>1CA23EE50692099D00951B8B</string>
-				<string>F5B724910F73CBB1004960D2</string>
+				<string>F5F7346D0F94B3DD003FC65B</string>
 				<string>F5A33EC20EC89C3000F8052D</string>
-				<string>F5B724920F73CBB1004960D2</string>
+				<string>F5F7346E0F94B3DD003FC65B</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 				<string>1CA23EE80692099D00951B8B</string>
-				<string>F5B724930F73CBB1004960D2</string>
+				<string>F5F7346F0F94B3DD003FC65B</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.buildAndRun</string>
@@ -827,7 +829,7 @@
 		<string>/Users/xx/Grafx2/Grafx2.xcodeproj</string>
 	</array>
 	<key>WindowString</key>
-	<string>-504 88 1487 657 0 0 1024 746 </string>
+	<string>52 -468 1092 651 0 0 1024 746 </string>
 	<key>WindowTools</key>
 	<array>
 		<dict>
diff --git a/engine.c b/engine.c
index a2beadc5..ea9fe6dd 100644
--- a/engine.c
+++ b/engine.c
@@ -182,29 +182,29 @@ int Button_under_mouse(void)
 
   for (btn_number=0;btn_number<NB_BUTTONS;btn_number++)
   {
-    switch(Button[btn_number].Shape)
+    switch(Buttons_Pool[btn_number].Shape)
     {
       case BUTTON_SHAPE_NO_FRAME :
       case BUTTON_SHAPE_RECTANGLE  :
 
-        if ((x_pos>=Button[btn_number].X_offset) &&
-            (y_pos>=Button[btn_number].Y_offset) &&
-            (x_pos<=Button[btn_number].X_offset+Button[btn_number].Width) &&
-            (y_pos<=Button[btn_number].Y_offset+Button[btn_number].Height))
+        if ((x_pos>=Buttons_Pool[btn_number].X_offset) &&
+            (y_pos>=Buttons_Pool[btn_number].Y_offset) &&
+            (x_pos<=Buttons_Pool[btn_number].X_offset+Buttons_Pool[btn_number].Width) &&
+            (y_pos<=Buttons_Pool[btn_number].Y_offset+Buttons_Pool[btn_number].Height))
           return btn_number;
         break;
 
       case BUTTON_SHAPE_TRIANGLE_TOP_LEFT:
-        if ((x_pos>=Button[btn_number].X_offset) &&
-            (y_pos>=Button[btn_number].Y_offset) &&
-            (x_pos+y_pos-(short)Button[btn_number].Y_offset-(short)Button[btn_number].X_offset<=Button[btn_number].Width))
+        if ((x_pos>=Buttons_Pool[btn_number].X_offset) &&
+            (y_pos>=Buttons_Pool[btn_number].Y_offset) &&
+            (x_pos+y_pos-(short)Buttons_Pool[btn_number].Y_offset-(short)Buttons_Pool[btn_number].X_offset<=Buttons_Pool[btn_number].Width))
           return btn_number;
         break;
 
       case BUTTON_SHAPE_TRIANGLE_BOTTOM_RIGHT:
-        if ((x_pos<=Button[btn_number].X_offset+Button[btn_number].Width) &&
-            (y_pos<=Button[btn_number].Y_offset+Button[btn_number].Height) &&
-            (x_pos+y_pos-(short)Button[btn_number].Y_offset-(short)Button[btn_number].X_offset>=Button[btn_number].Width))
+        if ((x_pos<=Buttons_Pool[btn_number].X_offset+Buttons_Pool[btn_number].Width) &&
+            (y_pos<=Buttons_Pool[btn_number].Y_offset+Buttons_Pool[btn_number].Height) &&
+            (x_pos+y_pos-(short)Buttons_Pool[btn_number].Y_offset-(short)Buttons_Pool[btn_number].X_offset>=Buttons_Pool[btn_number].Width))
           return btn_number;
         break;
     }
@@ -225,10 +225,10 @@ void Draw_menu_button_frame(byte btn_number,byte pressed)
   word x_pos;
   word y_pos;
 
-  start_x=Button[btn_number].X_offset;
-  start_y=Button[btn_number].Y_offset;
-  end_x  =start_x+Button[btn_number].Width;
-  end_y  =start_y+Button[btn_number].Height;
+  start_x=Buttons_Pool[btn_number].X_offset;
+  start_y=Buttons_Pool[btn_number].Y_offset;
+  end_x  =start_x+Buttons_Pool[btn_number].Width;
+  end_y  =start_y+Buttons_Pool[btn_number].Height;
 
   if (!pressed)
   {
@@ -243,7 +243,7 @@ void Draw_menu_button_frame(byte btn_number,byte pressed)
     color_diagonal=MC_Dark;
   }
 
-  switch(Button[btn_number].Shape)
+  switch(Buttons_Pool[btn_number].Shape)
   {
     case BUTTON_SHAPE_NO_FRAME :
       break;
@@ -284,7 +284,7 @@ void Draw_menu_button_frame(byte btn_number,byte pressed)
       Pixel_in_menu(start_x,end_y,color_diagonal);
       GFX_menu_block[end_y][start_x]=color_diagonal;
       // On colorie le coin haut gauche
-      for (x_pos=0;x_pos<Button[btn_number].Width;x_pos++)
+      for (x_pos=0;x_pos<Buttons_Pool[btn_number].Width;x_pos++)
       {
         Pixel_in_menu(start_x+x_pos,start_y,color_top_left);
         GFX_menu_block[start_y][start_x+x_pos]=color_top_left;
@@ -292,7 +292,7 @@ void Draw_menu_button_frame(byte btn_number,byte pressed)
         GFX_menu_block[start_y+x_pos][start_x]=color_top_left;
       }
       // On colorie la diagonale
-      for (x_pos=1;x_pos<Button[btn_number].Width;x_pos++)
+      for (x_pos=1;x_pos<Buttons_Pool[btn_number].Width;x_pos++)
       {
         Pixel_in_menu(start_x+x_pos,end_y-x_pos,color_bottom_right);
         GFX_menu_block[end_y-x_pos][start_x+x_pos]=color_bottom_right;
@@ -306,13 +306,13 @@ void Draw_menu_button_frame(byte btn_number,byte pressed)
       Pixel_in_menu(start_x,end_y,color_diagonal);
       GFX_menu_block[end_y][start_x]=color_diagonal;
       // On colorie la diagonale
-      for (x_pos=1;x_pos<Button[btn_number].Width;x_pos++)
+      for (x_pos=1;x_pos<Buttons_Pool[btn_number].Width;x_pos++)
       {
         Pixel_in_menu(start_x+x_pos,end_y-x_pos,color_top_left);
         GFX_menu_block[end_y-x_pos][start_x+x_pos]=color_top_left;
       }
       // On colorie le coin bas droite
-      for (x_pos=0;x_pos<Button[btn_number].Width;x_pos++)
+      for (x_pos=0;x_pos<Buttons_Pool[btn_number].Width;x_pos++)
       {
         Pixel_in_menu(end_x-x_pos,end_y,color_bottom_right);
         GFX_menu_block[end_y][end_x-x_pos]=color_bottom_right;
@@ -334,14 +334,14 @@ void Draw_menu_button_frame(byte btn_number,byte pressed)
 //---------------------- Désenclenchement d'un bouton ------------------------
 void Unselect_bouton(int btn_number)
 {
-  if (Button[btn_number].Pressed)
+  if (Buttons_Pool[btn_number].Pressed)
   {
     // On affiche le cadre autour du bouton de façon à ce qu'il paraisse relâché
     Draw_menu_button_frame(btn_number,BUTTON_RELEASED);
     // On considère que le bouton est relâché
-    Button[btn_number].Pressed=BUTTON_RELEASED;
+    Buttons_Pool[btn_number].Pressed=BUTTON_RELEASED;
     // On appelle le désenclenchement particulier au bouton:
-    Button[btn_number].Desenclencher();
+    Buttons_Pool[btn_number].Desenclencher();
   }
 }
 
@@ -374,7 +374,7 @@ void Unselect_button(int btn_number,byte click)
     Display_sprite_in_menu(btn_number,icon+(click==RIGHT_SIDE));
 
   // On note déjà la famille du bouton (La "Famiglia" c'est sacré)
-  family=Button[btn_number].Famille;
+  family=Buttons_Pool[btn_number].Famille;
 
   switch (family)
   {
@@ -388,7 +388,7 @@ void Unselect_button(int btn_number,byte click)
         // S'il est de la même famille
         if (
              (b!=btn_number) &&
-             (Button[b].Famille==FAMILY_INTERRUPTION) &&
+             (Buttons_Pool[b].Famille==FAMILY_INTERRUPTION) &&
              (  (b!=BUTTON_MAGNIFIER) ||
                ((b==BUTTON_MAGNIFIER) && (!Main_magnifier_mode)) )
            )
@@ -402,7 +402,7 @@ void Unselect_button(int btn_number,byte click)
       for (b=0; b<NB_BUTTONS; b++)
         // S'il est de la famille interruption
         if ( (b!=btn_number)
-          && (Button[b].Famille==FAMILY_INTERRUPTION)
+          && (Buttons_Pool[b].Famille==FAMILY_INTERRUPTION)
           // Et que ce n'est pas la loupe, ou alors qu'on n'est pas en mode loupe
           && (!(Main_magnifier_mode && (b==BUTTON_MAGNIFIER))) )
           // Alors on désenclenche le bouton
@@ -411,7 +411,7 @@ void Unselect_button(int btn_number,byte click)
       for (b=0; b<NB_BUTTONS; b++)
         // S'il est de la même famille
         if ( (b!=btn_number)
-          && (Button[b].Famille==family) )
+          && (Buttons_Pool[b].Famille==family) )
           // Alors on désenclenche le bouton
           Unselect_bouton(b);
   }
@@ -425,13 +425,13 @@ void Unselect_button(int btn_number,byte click)
   Wait_end_of_click();
 
   // On considère que le bouton est enfoncé
-  Button[btn_number].Pressed=BUTTON_PRESSED;
+  Buttons_Pool[btn_number].Pressed=BUTTON_PRESSED;
 
   // Puis on se contente d'appeler l'action correspondant au bouton:
   if (click==1)
-    Button[btn_number].Gauche();
+    Buttons_Pool[btn_number].Gauche();
   else
-    Button[btn_number].Droite();
+    Buttons_Pool[btn_number].Droite();
 }
 
 
diff --git a/global.h b/global.h
index 28a94510..cca44b61 100644
--- a/global.h
+++ b/global.h
@@ -516,7 +516,6 @@ GFX2_GLOBAL int Window_stack_attribute2[8];
 
 
 // Définition des boutons ////////////////////////////////////////////////////
-
 GFX2_GLOBAL struct
 {
   // Informations sur l'aspect du bouton (graphisme):
@@ -537,7 +536,7 @@ GFX2_GLOBAL struct
   Func_action Desenclencher;     // Action appelée lors du désenclenchement du bouton
   byte            Famille;           // Ensemble de boutons auquel celui-ci appartient
 
-} Button[NB_BUTTONS];
+} Buttons_Pool[NB_BUTTONS];
 
 
 
diff --git a/help.c b/help.c
index 3ab9c393..fabd8290 100644
--- a/help.c
+++ b/help.c
@@ -54,9 +54,9 @@ extern char SVN_revision[]; // generated in version.c
 word * Shortcut(word shortcut_number)
 {
   if (shortcut_number & 0x100)
-    return &(Button[shortcut_number & 0xFF].Left_shortcut[0]);
+    return &(Buttons_Pool[shortcut_number & 0xFF].Left_shortcut[0]);
   if (shortcut_number & 0x200)
-    return &(Button[shortcut_number & 0xFF].Right_shortcut[0]);
+    return &(Buttons_Pool[shortcut_number & 0xFF].Right_shortcut[0]);
   return &(Config_Key[shortcut_number & 0xFF][0]);
 }
 
diff --git a/init.c b/init.c
index 37c8cc29..5d40238d 100644
--- a/init.c
+++ b/init.c
@@ -776,16 +776,16 @@ void Init_button(byte   btn_number,
                         Func_action Desenclencher,
                         byte   family)
 {
-  Button[btn_number].X_offset      =x_offset;
-  Button[btn_number].Y_offset      =y_offset;
-  Button[btn_number].Width         =width-1;
-  Button[btn_number].Height         =height-1;
-  Button[btn_number].Pressed         =0;
-  Button[btn_number].Shape           =shape;
-  Button[btn_number].Gauche          =Gauche;
-  Button[btn_number].Droite          =Droite;
-  Button[btn_number].Desenclencher   =Desenclencher;
-  Button[btn_number].Famille         =family;
+  Buttons_Pool[btn_number].X_offset      =x_offset;
+  Buttons_Pool[btn_number].Y_offset      =y_offset;
+  Buttons_Pool[btn_number].Width         =width-1;
+  Buttons_Pool[btn_number].Height         =height-1;
+  Buttons_Pool[btn_number].Pressed         =0;
+  Buttons_Pool[btn_number].Shape           =shape;
+  Buttons_Pool[btn_number].Gauche          =Gauche;
+  Buttons_Pool[btn_number].Droite          =Droite;
+  Buttons_Pool[btn_number].Desenclencher   =Desenclencher;
+  Buttons_Pool[btn_number].Famille         =family;
 }
 
 
@@ -797,10 +797,10 @@ void Init_buttons(void)
 
   for (button_index=0;button_index<NB_BUTTONS;button_index++)
   {
-    Button[button_index].Left_shortcut[0]=0;
-    Button[button_index].Left_shortcut[1]=0;
-    Button[button_index].Right_shortcut[0]=0;
-    Button[button_index].Right_shortcut[1]=0;
+    Buttons_Pool[button_index].Left_shortcut[0]=0;
+    Buttons_Pool[button_index].Left_shortcut[1]=0;
+    Buttons_Pool[button_index].Right_shortcut[0]=0;
+    Buttons_Pool[button_index].Right_shortcut[1]=0;
     Init_button(button_index,
                        0,0,
                        1,1,
@@ -1771,12 +1771,12 @@ int Load_CFG(int reload_all)
                     Config_Key[Ordering[index2]&0xFF][1]=cfg_shortcut_info.Key2;
                     break;
                   case 1 :
-                    Button[Ordering[index2]&0xFF].Left_shortcut[0] = cfg_shortcut_info.Key;
-                    Button[Ordering[index2]&0xFF].Left_shortcut[1] = cfg_shortcut_info.Key2;
+                    Buttons_Pool[Ordering[index2]&0xFF].Left_shortcut[0] = cfg_shortcut_info.Key;
+                    Buttons_Pool[Ordering[index2]&0xFF].Left_shortcut[1] = cfg_shortcut_info.Key2;
                     break;
                   case 2 :
-                    Button[Ordering[index2]&0xFF].Right_shortcut[0] = cfg_shortcut_info.Key;
-                    Button[Ordering[index2]&0xFF].Right_shortcut[1] = cfg_shortcut_info.Key2;
+                    Buttons_Pool[Ordering[index2]&0xFF].Right_shortcut[0] = cfg_shortcut_info.Key;
+                    Buttons_Pool[Ordering[index2]&0xFF].Right_shortcut[1] = cfg_shortcut_info.Key2;
                     break;
                 }
               }
@@ -2014,12 +2014,12 @@ int Save_CFG(void)
         cfg_shortcut_info.Key2=Config_Key[Ordering[index]&0xFF][1]; 
         break;
       case 1 :
-        cfg_shortcut_info.Key =Button[Ordering[index]&0xFF].Left_shortcut[0]; 
-        cfg_shortcut_info.Key2=Button[Ordering[index]&0xFF].Left_shortcut[1]; 
+        cfg_shortcut_info.Key =Buttons_Pool[Ordering[index]&0xFF].Left_shortcut[0]; 
+        cfg_shortcut_info.Key2=Buttons_Pool[Ordering[index]&0xFF].Left_shortcut[1]; 
         break;
       case 2 : 
-        cfg_shortcut_info.Key =Button[Ordering[index]&0xFF].Right_shortcut[0]; 
-        cfg_shortcut_info.Key2=Button[Ordering[index]&0xFF].Right_shortcut[1]; 
+        cfg_shortcut_info.Key =Buttons_Pool[Ordering[index]&0xFF].Right_shortcut[0]; 
+        cfg_shortcut_info.Key2=Buttons_Pool[Ordering[index]&0xFF].Right_shortcut[1]; 
         break;
     }
     if (!Write_word_le(Handle, cfg_shortcut_info.Number) ||
@@ -2200,12 +2200,12 @@ void Set_config_defaults(void)
         Config_Key[Ordering[index]&0xFF][1]=ConfigKey[index].Key2;
         break;
       case 1 :
-        Button[Ordering[index]&0xFF].Left_shortcut[0] = ConfigKey[index].Key;
-        Button[Ordering[index]&0xFF].Left_shortcut[1] = ConfigKey[index].Key2;
+        Buttons_Pool[Ordering[index]&0xFF].Left_shortcut[0] = ConfigKey[index].Key;
+        Buttons_Pool[Ordering[index]&0xFF].Left_shortcut[1] = ConfigKey[index].Key2;
         break;
       case 2 :
-        Button[Ordering[index]&0xFF].Right_shortcut[0] = ConfigKey[index].Key;
-        Button[Ordering[index]&0xFF].Right_shortcut[1] = ConfigKey[index].Key2;
+        Buttons_Pool[Ordering[index]&0xFF].Right_shortcut[0] = ConfigKey[index].Key;
+        Buttons_Pool[Ordering[index]&0xFF].Right_shortcut[1] = ConfigKey[index].Key2;
         break;
     }
   }
diff --git a/input.c b/input.c
index 1e511bab..94889dd1 100644
--- a/input.c
+++ b/input.c
@@ -63,17 +63,17 @@ int Is_shortcut(word Key, word function)
     
   if (function & 0x100)
   {
-    if (Button[function&0xFF].Left_shortcut[0]==Key)
+    if (Buttons_Pool[function&0xFF].Left_shortcut[0]==Key)
       return 1;
-    if (Button[function&0xFF].Left_shortcut[1]==Key)
+    if (Buttons_Pool[function&0xFF].Left_shortcut[1]==Key)
       return 1;
     return 0;
   }
   if (function & 0x200)
   {
-    if (Button[function&0xFF].Right_shortcut[0]==Key)
+    if (Buttons_Pool[function&0xFF].Right_shortcut[0]==Key)
       return 1;
-    if (Button[function&0xFF].Right_shortcut[1]==Key)
+    if (Buttons_Pool[function&0xFF].Right_shortcut[1]==Key)
       return 1;
     return 0;
   }
diff --git a/windows.c b/windows.c
index b95485a0..72237375 100644
--- a/windows.c
+++ b/windows.c
@@ -353,8 +353,8 @@ void Change_palette_cells()
 
   // Mise à jour de la taille du bouton dans le menu. C'est pour pas que
   // la bordure noire soit active.
-  Button[BUTTON_CHOOSE_COL].Width=(Menu_palette_cell_width*Menu_cells_X)-1;
-  Button[BUTTON_CHOOSE_COL].Height=32/Menu_cells_Y*Menu_cells_Y-1;
+  Buttons_Pool[BUTTON_CHOOSE_COL].Width=(Menu_palette_cell_width*Menu_cells_X)-1;
+  Buttons_Pool[BUTTON_CHOOSE_COL].Height=32/Menu_cells_Y*Menu_cells_Y-1;
 }
 
 // Retrouve la couleur sur laquelle pointe le curseur souris.
@@ -872,9 +872,9 @@ void Display_sprite_in_menu(int btn_number,int sprite_number)
   word menu_y_pos;
   byte color;
 
-  menu_y_pos=Button[btn_number].Y_offset;
-  menu_x_pos=Button[btn_number].X_offset;
-  if (Button[btn_number].Shape != BUTTON_SHAPE_TRIANGLE_BOTTOM_RIGHT)
+  menu_y_pos=Buttons_Pool[btn_number].Y_offset;
+  menu_x_pos=Buttons_Pool[btn_number].X_offset;
+  if (Buttons_Pool[btn_number].Shape != BUTTON_SHAPE_TRIANGLE_BOTTOM_RIGHT)
   {
     menu_y_pos+=1;
     menu_x_pos+=1;
@@ -887,8 +887,8 @@ void Display_sprite_in_menu(int btn_number,int sprite_number)
       Pixel_in_menu(menu_x_pos+x_pos,menu_y_pos+y_pos,color);
       GFX_menu_block[menu_y_pos+y_pos][menu_x_pos+x_pos]=color;
     }
-  Update_rect(Menu_factor_X*(Button[btn_number].X_offset+1),
-    (Button[btn_number].Y_offset+1)*Menu_factor_Y+Menu_Y,
+  Update_rect(Menu_factor_X*(Buttons_Pool[btn_number].X_offset+1),
+    (Buttons_Pool[btn_number].Y_offset+1)*Menu_factor_Y+Menu_Y,
     MENU_SPRITE_WIDTH*Menu_factor_X,MENU_SPRITE_HEIGHT*Menu_factor_Y);
 }