diff --git a/arrow.cur b/arrow.cur
deleted file mode 100644
index d8d49b4..0000000
Binary files a/arrow.cur and /dev/null differ
diff --git a/arrowdl.cur b/arrowdl.cur
deleted file mode 100644
index 80962d4..0000000
Binary files a/arrowdl.cur and /dev/null differ
diff --git a/arrowdow.cur b/arrowdow.cur
deleted file mode 100644
index cb5c925..0000000
Binary files a/arrowdow.cur and /dev/null differ
diff --git a/arrowdr.cur b/arrowdr.cur
deleted file mode 100644
index 58ac867..0000000
Binary files a/arrowdr.cur and /dev/null differ
diff --git a/arrowlef.cur b/arrowlef.cur
deleted file mode 100644
index c40f781..0000000
Binary files a/arrowlef.cur and /dev/null differ
diff --git a/arrowrig.cur b/arrowrig.cur
deleted file mode 100644
index ca8e1aa..0000000
Binary files a/arrowrig.cur and /dev/null differ
diff --git a/arrowul.cur b/arrowul.cur
deleted file mode 100644
index f2356d4..0000000
Binary files a/arrowul.cur and /dev/null differ
diff --git a/arrowup.cur b/arrowup.cur
deleted file mode 100644
index 7390bf5..0000000
Binary files a/arrowup.cur and /dev/null differ
diff --git a/arrowur.cur b/arrowur.cur
deleted file mode 100644
index bd28c66..0000000
Binary files a/arrowur.cur and /dev/null differ
diff --git a/blupi-d.rc b/blupi-d.rc
index becd8eb..34cddc1 100644
--- a/blupi-d.rc
+++ b/blupi-d.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -16,10 +16,8 @@
 // French (Switzerland) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRS)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -28,9 +26,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "blupi.ico"
+IDR_MAINFRAME           ICON                    "blupi.ico"
+
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -53,14 +51,14 @@ BEGIN
     BEGIN
         BLOCK "100c04b0"
         BEGIN
-            VALUE "CompanyName", "EPSITEC\0"
-            VALUE "FileDescription", "Blupi\0"
-            VALUE "FileVersion", "0, 4, 0, 0\0"
-            VALUE "InternalName", "Planet Blupi\0"
-            VALUE "LegalCopyright", "Copyright © 1997\0"
-            VALUE "OriginalFilename", "Blupi.exe\0"
-            VALUE "ProductName", "EPSITEC Planet Blupi\0"
-            VALUE "ProductVersion", "0, 4, 0, 0\0"
+            VALUE "CompanyName", "EPSITEC"
+            VALUE "FileDescription", "Blupi"
+            VALUE "FileVersion", "0, 4, 0, 0"
+            VALUE "InternalName", "Planet Blupi"
+            VALUE "LegalCopyright", "Copyright © 1997"
+            VALUE "OriginalFilename", "Blupi.exe"
+            VALUE "ProductName", "EPSITEC Planet Blupi"
+            VALUE "ProductVersion", "0, 4, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
@@ -69,28 +67,6 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-IDC_POINTER             CURSOR  DISCARDABLE     "cursor1.cur"
-IDC_MAP                 CURSOR  DISCARDABLE     "map.cur"
-IDC_ARROWU              CURSOR  DISCARDABLE     "arrowup.cur"
-IDC_ARROWD              CURSOR  DISCARDABLE     "arrowdow.cur"
-IDC_ARROWL              CURSOR  DISCARDABLE     "arrowlef.cur"
-IDC_ARROWR              CURSOR  DISCARDABLE     "arrowrig.cur"
-IDC_ARROWUL             CURSOR  DISCARDABLE     "arrowul.cur"
-IDC_ARROWUR             CURSOR  DISCARDABLE     "arrowur.cur"
-IDC_ARROWDR             CURSOR  DISCARDABLE     "arrowdr.cur"
-IDC_ARROWDL             CURSOR  DISCARDABLE     "arrowdl.cur"
-IDC_WAIT                CURSOR  DISCARDABLE     "wait.cur"
-IDC_EMPTY               CURSOR  DISCARDABLE     "empty.cur"
-IDC_FILL                CURSOR  DISCARDABLE     "fill.cur"
-IDC_ARROW               CURSOR  DISCARDABLE     "arrow.cur"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -98,18 +74,18 @@ IDC_ARROW               CURSOR  DISCARDABLE     "arrow.cur"
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -123,7 +99,7 @@ END
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_GO            "Gehen"
     TX_ACTION_STOP          "Halt"
@@ -142,7 +118,7 @@ BEGIN
     TX_ACTION_MUR           "Mauer"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_PALIS         "Palisade"
     TX_ACTION_ABATn         "Bäume fällen"
@@ -162,7 +138,7 @@ BEGIN
     TX_ACTION_FABMINE       "Zeitbombe bauen"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ERROR_MISC           "Hier nicht möglich"
     TX_ERROR_GROUND         "Untergrund nicht geeignet"
@@ -174,7 +150,7 @@ BEGIN
     TX_ERROR_TELE2          "Es gibt schon 2 Beammaschinen"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_IONAMEEX             "Training %d, Zeit %d"
     TX_IOFREE               "frei"
@@ -190,7 +166,7 @@ BEGIN
     TX_BUTTON_TERM          "Beenden"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_READP         "Gespeicherte Mission öffnen"
     TX_BUTTON_WRITEP        "Mission speichern"
@@ -210,7 +186,7 @@ BEGIN
     TX_JAUGE2               "Arbeitsfortschritt"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_SETUP         "Einstellungen"
     TX_BUTTON_MUSIC         "Auswahl der Musik"
@@ -230,7 +206,7 @@ BEGIN
     TX_BUTTON_MUSIC10       "Musik Nummer 9"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_REGION        "Auswahl der Umgebung"
     TX_BUTTON_TERMMBLUPI    "Blupi im Haus"
@@ -250,7 +226,7 @@ BEGIN
     TX_NON                  "Nein"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_BLUPIm           "Kranker Blupi"
     TX_OBJ_BLUPIf           "Erschöpfter Blupi"
@@ -270,7 +246,7 @@ BEGIN
     TX_OBJ_FLEUR1           "Blumen"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_FLEUR2           "Blumen"
     TX_OBJ_FLEUR3           "Blumen"
@@ -290,7 +266,7 @@ BEGIN
     TX_OBJ_MUR              "Mauer"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_ARBREb           "Baumstämme"
     TX_OBJ_ROC              "Felsen"
@@ -310,7 +286,7 @@ BEGIN
     TX_OBJ_MAISON           "Blupis Haus"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_HACHURE          "Gestreifte Quadrate"
     TX_OBJ_MOUSSEb          "Verbrannter Untergrund"
@@ -330,7 +306,7 @@ BEGIN
     TX_OBJ_BATENNEMIS       "Feindliches Gebäude"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_WIN1                 "Toll, Du hast es geschafft"
     TX_WIN2                 "Ja, super"
@@ -339,7 +315,7 @@ BEGIN
     TX_WIN5                 "Auftrag erfüllt"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LOST1                "Das war nichts, probier es noch einmal !"
     TX_LOST2                "Nein, so geht das leider nicht !"
@@ -347,19 +323,19 @@ BEGIN
     TX_LOST4                "Das war leider nicht die richtige Lösung !"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LOST5                "Aber nein, doch nicht so..."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LASTWIN1             "Du kannst jetzt mit den Missionen beginnen."
     TX_LASTWIN2             "Bravo, das Spiel ist beendet !"
     TX_LASTWIN3             "Letzte konstruierte Mission beendet."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_SETUP9        "Langsamer"
     TX_BUTTON_SETUP10       "Schneller"
@@ -373,7 +349,7 @@ BEGIN
     TX_BUTTON_REGION2       "Wüste"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_REGION3       "Verschneiter Wald"
     TX_BUTTON_REGION4       "Wald"
@@ -393,7 +369,7 @@ BEGIN
     TX_PRIVATE_HACHBLUPI    "1|Auf die gestreiften Quadrate gehen."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_FABDISC       "Roboter bauen"
     TX_ACTION_REPEAT        "Wiederholen"
@@ -401,7 +377,7 @@ BEGIN
     TX_ACTION_FABARMURE     "Rüstung bauen"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_PRIVATE_HACHPLANCHE  "1|Bretter auf die\n1|gestreiften Quadrate legen."
     TX_PRIVATE_HACHTOMATE   "1|Tomaten auf die\n1|gestreiften Quadrate legen."
@@ -417,7 +393,7 @@ BEGIN
     TX_PRIVATE_OBJECTIF     "1|Ziel :"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_PRIVATE_NBBLUPI      "1|Die Blupibevölkerung muss mindestens %d Blupi(s) betragen."
     TX_BUTTON_SKILL         "Schwierigkeitsgrad"
@@ -430,7 +406,7 @@ BEGIN
     TX_PRIVATE_HACHROBOT    "1|Der Roboter muss die\n1|gestreiften Quadrate erreichen."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_REPEAT_CULTIVE       "1: Tomaten anbauen...\n2: Essen"
     TX_REPEAT_FLEUR         "1: Blumenstrauss binden\n2: Verarbeiten"
@@ -446,7 +422,7 @@ BEGIN
     TX_REPEAT_FABARMURE     "1: Eisen abbauen\n2: Rüstung bauen"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_MURPAL           "Mauer oder Palissade"
     TX_OBJ_OBJET            "Gegenstände"
@@ -460,7 +436,7 @@ BEGIN
     TX_OBJ_BARENNEMIS       "Feindlicher Zaun"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_DIRECT_N             "N"
     TX_DIRECT_S             "S"
diff --git a/blupi-e.rc b/blupi-e.rc
index 4e314e6..d2dca35 100644
--- a/blupi-e.rc
+++ b/blupi-e.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -16,10 +16,8 @@
 // French (Switzerland) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRS)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -28,9 +26,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "blupi.ico"
+IDR_MAINFRAME           ICON                    "blupi.ico"
+
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -53,14 +51,14 @@ BEGIN
     BEGIN
         BLOCK "100c04b0"
         BEGIN
-            VALUE "CompanyName", "EPSITEC\0"
-            VALUE "FileDescription", "Blupi\0"
-            VALUE "FileVersion", "0, 4, 0, 0\0"
-            VALUE "InternalName", "Planet Blupi\0"
-            VALUE "LegalCopyright", "Copyright © 1997\0"
-            VALUE "OriginalFilename", "Blupi.exe\0"
-            VALUE "ProductName", "EPSITEC Planet Blupi\0"
-            VALUE "ProductVersion", "0, 4, 0, 0\0"
+            VALUE "CompanyName", "EPSITEC"
+            VALUE "FileDescription", "Blupi"
+            VALUE "FileVersion", "0, 4, 0, 0"
+            VALUE "InternalName", "Planet Blupi"
+            VALUE "LegalCopyright", "Copyright © 1997"
+            VALUE "OriginalFilename", "Blupi.exe"
+            VALUE "ProductName", "EPSITEC Planet Blupi"
+            VALUE "ProductVersion", "0, 4, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
@@ -69,28 +67,6 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-IDC_POINTER             CURSOR  DISCARDABLE     "cursor1.cur"
-IDC_MAP                 CURSOR  DISCARDABLE     "map.cur"
-IDC_ARROWU              CURSOR  DISCARDABLE     "arrowup.cur"
-IDC_ARROWD              CURSOR  DISCARDABLE     "arrowdow.cur"
-IDC_ARROWL              CURSOR  DISCARDABLE     "arrowlef.cur"
-IDC_ARROWR              CURSOR  DISCARDABLE     "arrowrig.cur"
-IDC_ARROWUL             CURSOR  DISCARDABLE     "arrowul.cur"
-IDC_ARROWUR             CURSOR  DISCARDABLE     "arrowur.cur"
-IDC_ARROWDR             CURSOR  DISCARDABLE     "arrowdr.cur"
-IDC_ARROWDL             CURSOR  DISCARDABLE     "arrowdl.cur"
-IDC_WAIT                CURSOR  DISCARDABLE     "wait.cur"
-IDC_EMPTY               CURSOR  DISCARDABLE     "empty.cur"
-IDC_FILL                CURSOR  DISCARDABLE     "fill.cur"
-IDC_ARROW               CURSOR  DISCARDABLE     "arrow.cur"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -98,18 +74,18 @@ IDC_ARROW               CURSOR  DISCARDABLE     "arrow.cur"
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -123,7 +99,7 @@ END
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_GO            "Go"
     TX_ACTION_STOP          "Stop"
@@ -142,7 +118,7 @@ BEGIN
     TX_ACTION_MUR           "Wall"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_PALIS         "Palisade"
     TX_ACTION_ABATn         "Cut down  trees"
@@ -162,7 +138,7 @@ BEGIN
     TX_ACTION_FABMINE       "Make a time bomb"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ERROR_MISC           "Impossible"
     TX_ERROR_GROUND         "Inadequate ground"
@@ -174,7 +150,7 @@ BEGIN
     TX_ERROR_TELE2          "Already two teleporters"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_IONAMEEX             "training %d, time %d"
     TX_IOFREE               "free slot"
@@ -190,7 +166,7 @@ BEGIN
     TX_BUTTON_TERM          "Finish"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_READP         "Open another game "
     TX_BUTTON_WRITEP        "Save this game"
@@ -210,7 +186,7 @@ BEGIN
     TX_JAUGE2               "Work done"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_SETUP         "Settings"
     TX_BUTTON_MUSIC         "Music choice"
@@ -230,7 +206,7 @@ BEGIN
     TX_BUTTON_MUSIC10       "Music number 9"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_REGION        "Scenery choice"
     TX_BUTTON_TERMMBLUPI    "Blupi in house"
@@ -250,7 +226,7 @@ BEGIN
     TX_NON                  "No"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_BLUPIm           "Sick Blupi"
     TX_OBJ_BLUPIf           "Tired Blupi"
@@ -270,7 +246,7 @@ BEGIN
     TX_OBJ_FLEUR1           "Flowers"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_FLEUR2           "Flowers"
     TX_OBJ_FLEUR3           "Flowers"
@@ -290,7 +266,7 @@ BEGIN
     TX_OBJ_MUR              "Wall"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_ARBREb           "Tree trunks"
     TX_OBJ_ROC              "Rocks"
@@ -310,7 +286,7 @@ BEGIN
     TX_OBJ_MAISON           "Blupi's house"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_HACHURE          "Striped paving stones"
     TX_OBJ_MOUSSEb          "Burnt ground"
@@ -330,7 +306,7 @@ BEGIN
     TX_OBJ_BATENNEMIS       "Enemy buildings"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_WIN1                 "Well done !"
     TX_WIN2                 "Yes, great ..."
@@ -339,7 +315,7 @@ BEGIN
     TX_WIN5                 "Mission over..."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LOST1                "You have failed, try again..."
     TX_LOST2                "No, wrong way ..."
@@ -347,19 +323,19 @@ BEGIN
     TX_LOST4                "Another mistake..."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LOST5                "No, not that way !"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LASTWIN1             "Now go on mission."
     TX_LASTWIN2             "Very good, success on all missions !"
     TX_LASTWIN3             "Last construction resolved !"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_SETUP9        "Slower"
     TX_BUTTON_SETUP10       "Faster"
@@ -373,7 +349,7 @@ BEGIN
     TX_BUTTON_REGION2       "Desert"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_REGION3       "Forest under snow"
     TX_BUTTON_REGION4       "Forest"
@@ -393,7 +369,7 @@ BEGIN
     TX_PRIVATE_HACHBLUPI    "1|Go on striped\n1| paving stones."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_FABDISC       "Make a helper robot"
     TX_ACTION_REPEAT        "Repeat"
@@ -401,7 +377,7 @@ BEGIN
     TX_ACTION_FABARMURE     "Make armour"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_PRIVATE_HACHPLANCHE  "1|Drop planks on striped \n1|paving stones."
     TX_PRIVATE_HACHTOMATE   "1|Drop tomatoes on striped \n1|paving stones."
@@ -417,7 +393,7 @@ BEGIN
     TX_PRIVATE_OBJECTIF     "1|Goal :"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_PRIVATE_NBBLUPI      "1|The Blupi population must \n1|be of at least  %d Blupis."
     TX_BUTTON_SKILL         "Skill level"
@@ -430,7 +406,7 @@ BEGIN
     TX_PRIVATE_HACHROBOT    "1|The robot must reach\n1|the striped paving stones."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_REPEAT_CULTIVE       "1: Grow tomatoes\n2: Eat"
     TX_REPEAT_FLEUR         "1: Make a bunch\n2: Transform"
@@ -446,7 +422,7 @@ BEGIN
     TX_REPEAT_FABARMURE     "1: Extract iron\n2: Make an armour"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_MURPAL           "Wall or palisade"
     TX_OBJ_OBJET            "Items"
@@ -460,7 +436,7 @@ BEGIN
     TX_OBJ_BARENNEMIS       "Enemy barrier"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_DIRECT_N             "N"
     TX_DIRECT_S             "S"
diff --git a/blupi-f.rc b/blupi-f.rc
index 2db4d4f..e2a9c7b 100644
--- a/blupi-f.rc
+++ b/blupi-f.rc
@@ -1,4 +1,4 @@
-//Microsoft Developer Studio generated resource script.
+// Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
 
@@ -16,10 +16,8 @@
 // French (Switzerland) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRS)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -28,9 +26,9 @@ LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDR_MAINFRAME           ICON    DISCARDABLE     "blupi.ico"
+IDR_MAINFRAME           ICON                    "blupi.ico"
+
 
-#ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
@@ -53,14 +51,14 @@ BEGIN
     BEGIN
         BLOCK "100c04b0"
         BEGIN
-            VALUE "CompanyName", "EPSITEC\0"
-            VALUE "FileDescription", "Blupi\0"
-            VALUE "FileVersion", "0, 4, 0, 0\0"
-            VALUE "InternalName", "Planet Blupi\0"
-            VALUE "LegalCopyright", "Copyright © 1997\0"
-            VALUE "OriginalFilename", "Blupi.exe\0"
-            VALUE "ProductName", "EPSITEC Planet Blupi\0"
-            VALUE "ProductVersion", "0, 4, 0, 0\0"
+            VALUE "CompanyName", "EPSITEC"
+            VALUE "FileDescription", "Blupi"
+            VALUE "FileVersion", "0, 4, 0, 0"
+            VALUE "InternalName", "Planet Blupi"
+            VALUE "LegalCopyright", "Copyright © 1997"
+            VALUE "OriginalFilename", "Blupi.exe"
+            VALUE "ProductName", "EPSITEC Planet Blupi"
+            VALUE "ProductVersion", "0, 4, 0, 0"
         END
     END
     BLOCK "VarFileInfo"
@@ -69,28 +67,6 @@ BEGIN
     END
 END
 
-#endif    // !_MAC
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Cursor
-//
-
-IDC_POINTER             CURSOR  DISCARDABLE     "cursor1.cur"
-IDC_MAP                 CURSOR  DISCARDABLE     "map.cur"
-IDC_ARROWU              CURSOR  DISCARDABLE     "arrowup.cur"
-IDC_ARROWD              CURSOR  DISCARDABLE     "arrowdow.cur"
-IDC_ARROWL              CURSOR  DISCARDABLE     "arrowlef.cur"
-IDC_ARROWR              CURSOR  DISCARDABLE     "arrowrig.cur"
-IDC_ARROWUL             CURSOR  DISCARDABLE     "arrowul.cur"
-IDC_ARROWUR             CURSOR  DISCARDABLE     "arrowur.cur"
-IDC_ARROWDR             CURSOR  DISCARDABLE     "arrowdr.cur"
-IDC_ARROWDL             CURSOR  DISCARDABLE     "arrowdl.cur"
-IDC_WAIT                CURSOR  DISCARDABLE     "wait.cur"
-IDC_EMPTY               CURSOR  DISCARDABLE     "empty.cur"
-IDC_FILL                CURSOR  DISCARDABLE     "fill.cur"
-IDC_ARROW               CURSOR  DISCARDABLE     "arrow.cur"
 
 #ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
@@ -98,18 +74,18 @@ IDC_ARROW               CURSOR  DISCARDABLE     "arrow.cur"
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE DISCARDABLE 
+1 TEXTINCLUDE 
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE DISCARDABLE 
+2 TEXTINCLUDE 
 BEGIN
     "#include ""afxres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE DISCARDABLE 
+3 TEXTINCLUDE 
 BEGIN
     "\r\n"
     "\0"
@@ -123,7 +99,7 @@ END
 // String Table
 //
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_GO            "Va"
     TX_ACTION_STOP          "Stoppe"
@@ -142,7 +118,7 @@ BEGIN
     TX_ACTION_MUR           "Mur anti-feu"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_PALIS         "Palissade"
     TX_ACTION_ABATn         "Abat des arbres"
@@ -162,7 +138,7 @@ BEGIN
     TX_ACTION_FABMINE       "Fabrique une bombe"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ERROR_MISC           "Impossible ici"
     TX_ERROR_GROUND         "Terrain pas adapté"
@@ -174,7 +150,7 @@ BEGIN
     TX_ERROR_TELE2          "Déjà 2 téléporteurs"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_IONAMEEX             "entraînement %d, temps %d"
     TX_IOFREE               "libre"
@@ -190,7 +166,7 @@ BEGIN
     TX_BUTTON_TERM          "Terminer"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_READP         "Ouvrir une autre partie"
     TX_BUTTON_WRITEP        "Enregistrer la partie en cours"
@@ -210,7 +186,7 @@ BEGIN
     TX_JAUGE2               "Travail en cours"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_SETUP         "Réglages"
     TX_BUTTON_MUSIC         "Choix de la musique"
@@ -230,7 +206,7 @@ BEGIN
     TX_BUTTON_MUSIC10       "Musique numéro 9"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_REGION        "Choix des décors"
     TX_BUTTON_TERMMBLUPI    "Blupi dans sa maison"
@@ -250,7 +226,7 @@ BEGIN
     TX_NON                  "Non"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_BLUPIm           "Blupi malade"
     TX_OBJ_BLUPIf           "Blupi fatigué"
@@ -270,7 +246,7 @@ BEGIN
     TX_OBJ_FLEUR1           "Fleurs"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_FLEUR2           "Fleurs"
     TX_OBJ_FLEUR3           "Fleurs"
@@ -290,7 +266,7 @@ BEGIN
     TX_OBJ_MUR              "Mur anti-feu"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_ARBREb           "Troncs"
     TX_OBJ_ROC              "Rochers"
@@ -310,7 +286,7 @@ BEGIN
     TX_OBJ_MAISON           "Maison de blupi"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_HACHURE          "Dalles hachurées"
     TX_OBJ_MOUSSEb          "Mousse brûlée"
@@ -330,7 +306,7 @@ BEGIN
     TX_OBJ_BATENNEMIS       "Bâtiments ennemis"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_WIN1                 "Bravo, c'est réussi !"
     TX_WIN2                 "Oui, super ..."
@@ -339,7 +315,7 @@ BEGIN
     TX_WIN5                 "Mission accomplie."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LOST1                "C'est raté, essaie encore une fois"
     TX_LOST2                "Et non, ce n'est pas ça ..."
@@ -347,19 +323,19 @@ BEGIN
     TX_LOST4                "Caramba, encore raté ..."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LOST5                "Mais non, pas comme ça !"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_LASTWIN1             "Passe maintenant aux missions."
     TX_LASTWIN2             "Magnifique, le jeu est terminé !"
     TX_LASTWIN3             "Dernière construction résolue !"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_SETUP9        "Diminue la vitesse"
     TX_BUTTON_SETUP10       "Augmente la vitesse"
@@ -373,7 +349,7 @@ BEGIN
     TX_BUTTON_REGION2       "Désert"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_BUTTON_REGION3       "Forêt enneigée"
     TX_BUTTON_REGION4       "Forêt"
@@ -393,7 +369,7 @@ BEGIN
     TX_PRIVATE_HACHBLUPI    "1|Aller sur les dalles\n1|hachurées."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_ACTION_FABDISC       "Fabrique un robot"
     TX_ACTION_REPEAT        "Répète"
@@ -401,7 +377,7 @@ BEGIN
     TX_ACTION_FABARMURE     "Fabrique une armure"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_PRIVATE_HACHPLANCHE  "1|Déposer des planches\n1|sur les dalles hachurées."
     TX_PRIVATE_HACHTOMATE   "1|Déposer des tomates\n1|sur les dalles hachurées."
@@ -417,7 +393,7 @@ BEGIN
     TX_PRIVATE_OBJECTIF     "1|Objectif :"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_PRIVATE_NBBLUPI      "1|La population doit être\n1|d'au moins %d Blupi."
     TX_BUTTON_SKILL         "Niveau de difficulté"
@@ -430,7 +406,7 @@ BEGIN
     TX_PRIVATE_HACHROBOT    "1|Le robot doit atteindre\n1|les dalles hachurées."
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_REPEAT_CULTIVE       "1: Cultive ...\n2: Mange"
     TX_REPEAT_FLEUR         "1: Fait un bouquet\n2: Transforme"
@@ -446,7 +422,7 @@ BEGIN
     TX_REPEAT_FABARMURE     "1: Extrait du fer\n2: Fabrique armure"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_OBJ_MURPAL           "Mur ou palissade"
     TX_OBJ_OBJET            "Objets"
@@ -460,7 +436,7 @@ BEGIN
     TX_OBJ_BARENNEMIS       "Barrière ennemie"
 END
 
-STRINGTABLE DISCARDABLE 
+STRINGTABLE
 BEGIN
     TX_DIRECT_N             "N"
     TX_DIRECT_S             "S"
diff --git a/cursor1.cur b/cursor1.cur
deleted file mode 100644
index aa9f335..0000000
Binary files a/cursor1.cur and /dev/null differ
diff --git a/empty.cur b/empty.cur
deleted file mode 100644
index 0ac9262..0000000
Binary files a/empty.cur and /dev/null differ
diff --git a/fill.cur b/fill.cur
deleted file mode 100644
index 1c1b24b..0000000
Binary files a/fill.cur and /dev/null differ
diff --git a/map.cur b/map.cur
deleted file mode 100644
index e270c4d..0000000
Binary files a/map.cur and /dev/null differ
diff --git a/resource.h b/resource.h
index c30f2ef..cb67028 100644
--- a/resource.h
+++ b/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Developer Studio generated include file.
-// Used by Blupi.rc
+// Microsoft Visual C++ generated include file.
+// Used by blupi-e.rc
 //
 #define TX_ACTION_GO                    1
 #define TX_ACTION_STOP                  2
diff --git a/wait.cur b/wait.cur
deleted file mode 100644
index 55f7588..0000000
Binary files a/wait.cur and /dev/null differ