diff --git a/helpfile.h b/helpfile.h
index 383f4c58..e328b02d 100644
--- a/helpfile.h
+++ b/helpfile.h
@@ -306,16 +306,28 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("  Re-licensed GrafX2 under the GPL in 2001")
   HELP_TEXT ("  Huge thanks to them for their work !")
   HELP_TEXT ("")
-  HELP_BOLD ("                    ART")
+  HELP_BOLD ("         OTHER CODE CONTRIBUTORS")
   HELP_TEXT ("")
-  HELP_TEXT ("  CLASSIC THEME")
-  HELP_TEXT ("  GrafX2 logo by Made (www.m4de.com)")
-  HELP_TEXT ("  Icons and fonts by X-Man ")
-  HELP_TEXT ("  MODERN THEME")
-  HELP_TEXT ("  Graphics and logo by iLKke")
-  HELP_TEXT ("                   (ilkke.blogspot.com)")
+  HELP_TEXT ("  Karl Bartel")
+  HELP_TEXT ("     SFont: bitmap fonts rendering")
   HELP_TEXT ("")
-  HELP_TEXT ("  Pixelled all the graphics")
+  HELP_TEXT ("  Petter Lindquist")
+  HELP_TEXT ("     C64 file and image formats")
+  HELP_TEXT ("")
+  HELP_TEXT ("")
+  HELP_TITLE("         ART")
+  HELP_TEXT ("")
+  HELP_TEXT ("  Made (www.m4de.com)")
+  HELP_TEXT ("     Logo (classic)")
+  HELP_TEXT ("")
+  HELP_TEXT ("  X-Man")
+  HELP_TEXT ("     Buttons and fonts (classic)")
+  HELP_TEXT ("")
+  HELP_TEXT ("  iLKke (ilkke.blogspot.com)")
+  HELP_TEXT ("     Buttons and logo (modern), extra fonts")
+  HELP_TEXT ("")
+  HELP_TEXT ("")
+  HELP_TEXT ("               ...Pixelled all the graphics")
   HELP_TEXT ("")
   HELP_TITLE(" OTHER MACHINES PORTS")
   HELP_TEXT ("")
@@ -340,6 +352,11 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("")
   HELP_TEXT ("  Luc Schrijvers (Begasus)")
   HELP_TEXT ("")
+  HELP_BOLD ("           LINUX BINARIES")
+  HELP_TEXT ("")
+  HELP_TEXT ("  Gentoo : Matteo 'Peach' Pescarin")
+  HELP_TEXT ("  Debian : Gürkan Sengün")
+  HELP_TEXT ("")
   HELP_BOLD ("               MAC OS X PORT")
   HELP_TEXT ("")
   HELP_TEXT ("  Franck Charlet (hitchhikr)")
@@ -353,8 +370,8 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("")
   HELP_TEXT ("  Luc Schrijvers (Begasus)")
   HELP_TEXT ("")
-  HELP_TEXT ("  ... made it work on your favourite toaster")
   HELP_TEXT ("")
+  HELP_TEXT ("  ... made it work on your favourite toaster")
   HELP_TEXT ("")
   HELP_TITLE(" BUGFINDERS")
   HELP_TEXT ("")
@@ -370,8 +387,8 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("  Timo Kurrpa   titus^Rab      Tobé         ")
   HELP_TEXT ("  00ai99")
   HELP_TEXT ("")
-  HELP_TEXT ("  ... posted the annoying bug reports.")
   HELP_TEXT ("")
+  HELP_TEXT ("  ... posted the annoying bug reports.")
   HELP_TEXT ("")
   HELP_TITLE(" FILE FORMATS CREDITS")
   HELP_TEXT ("")
@@ -397,13 +414,17 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("")
   HELP_TITLE(" GREETINGS")
   HELP_TEXT ("")
+  HELP_BOLD ("Pulkomandy:")
+  HELP_TEXT ("")
   HELP_TEXT ("  To the Pouet.net BBS posters, the #CPC")
   HELP_TEXT ("  trolls and the bitfellas")
   HELP_TEXT ("  To every people who makes the scene alive!")
   HELP_TEXT ("  To all guys making nice pixelled pictures")
   HELP_TEXT ("  (with or without GrafX2)")
   HELP_TEXT ("")
-  HELP_BOLD ("  We send our best regards to...")
+  HELP_BOLD ("Sunset Designs:")
+  HELP_TEXT ("")
+  HELP_TEXT ("  We send our best regards to...")
   HELP_TEXT ("")
   HELP_TEXT ("  Access        Filter        Pink")
   HELP_TEXT ("  Ace           Fiver         Pixel")
@@ -458,6 +479,25 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("  and all #pixel, #demofr and #coders.")
   HELP_TEXT ("")
   HELP_TEXT ("")
+  HELP_TEXT ("  Some information taken from several docs")
+  HELP_TEXT ("  (PCGPE, Intervue, PC Interdit...)")
+  HELP_TEXT ("  gave us an invaluable help.")
+  HELP_TEXT ("")
+  HELP_TEXT ("  Thanks to Shawn Hargreaves for his filled")
+  HELP_TEXT ("  polygon routine from Allegro v2.2.")
+  HELP_TEXT ("")
+  HELP_TEXT ("  Thanks to Carlos \"Made\" Pardo for his")
+  HELP_TEXT ("  great GrafX2 logo.")
+  HELP_TEXT ("")
+  HELP_TEXT ("  This is our very first program compiled")
+  HELP_TEXT ("  with the Gnu C Compiler.")
+  HELP_TEXT ("  A thousand thanks to the authors of")
+  HELP_TEXT ("  this compiler.")
+  HELP_TEXT ("")
+  HELP_TEXT ("  We also would like to thank all the")
+  HELP_TEXT ("  people who gave us ideas to improve")
+  HELP_TEXT ("  GrafX2.")
+  HELP_TEXT ("")
   HELP_TITLE (" SNAIL MAIL")
   HELP_TEXT ("")
 //HELP_TEXT ("0----5----0----5----0----5----0----5----0--X")
@@ -478,27 +518,6 @@ static const T_Help_table helptable_credits[] =
   HELP_TEXT ("  (From 2001, current status: unknown)")
   HELP_TEXT ("")
   HELP_TEXT ("")
-  HELP_TITLE(" THANKS")
-  HELP_TEXT ("")
-  HELP_TEXT ("  Some information taken from several docs")
-  HELP_TEXT ("  (PCGPE, Intervue, PC Interdit...)")
-  HELP_TEXT ("  gave us an invaluable help.")
-  HELP_TEXT ("")
-  HELP_TEXT ("  Thanks to Shawn Hargreaves for his filled")
-  HELP_TEXT ("  polygon routine from Allegro v2.2.")
-  HELP_TEXT ("")
-  HELP_TEXT ("  Thanks to Carlos \"Made\" Pardo for his")
-  HELP_TEXT ("  great GrafX2 logo.")
-  HELP_TEXT ("")
-  HELP_TEXT ("  This is our very first program compiled")
-  HELP_TEXT ("  with the Gnu C Compiler.")
-  HELP_TEXT ("  A thousand thanks to the authors of")
-  HELP_TEXT ("  this compiler.")
-  HELP_TEXT ("")
-  HELP_TEXT ("  We also would like to thank all the")
-  HELP_TEXT ("  people who gave us ideas to improve")
-  HELP_TEXT ("  GrafX2.")
-  HELP_TITLE("")
 };
 static const T_Help_table helptable_paintbrush[] =
 {
@@ -560,6 +579,18 @@ static const T_Help_table helptable_paintbrush[] =
   HELP_TEXT ("to the \"miscellaneous\" family and their size")
   HELP_TEXT ("cannot be modified.")
   HELP_TEXT ("")
+  HELP_BOLD ("BRUSH CONTAINER")
+  HELP_TEXT ("")
+  HELP_TEXT ("The bottom row, initially showing empty")
+  HELP_TEXT ("buttons, is the brush container. You can")
+  HELP_TEXT ("right-click a button to store the current")
+  HELP_TEXT ("brush in it, and then whenever you need the")
+  HELP_TEXT ("brush back, open this menu again and")
+  HELP_TEXT ("left-click the button.")
+  HELP_TEXT ("The container can memorize resizable brushes")
+  HELP_TEXT ("as well as brushes grabbed from the image.")
+  HELP_TEXT ("Brushes are lost when you exit the program.")
+  HELP_TEXT ("")
   HELP_BOLD ("    RIGHT CLICK     ")
   HELP_LINK ("(Key:%s)",0x200+BUTTON_PAINTBRUSHES)
   HELP_TEXT ("")
@@ -1483,7 +1514,7 @@ static const T_Help_table helptable_effects[] =
   HELP_TEXT ("of the same size such   as a font or tiles,")
   HELP_TEXT ("or for drawing figures or grabbing brushes")
   HELP_TEXT ("with their   dimensions multiple of the step")
-  HELP_TEXT ("of the grid.');")
+  HELP_TEXT ("of the grid.")
   HELP_BOLD ("LEFT CLICK")
   HELP_LINK ("(Key: %s)",   SPECIAL_GRID_MODE)
   HELP_TEXT ("")
@@ -1500,7 +1531,12 @@ static const T_Help_table helptable_effects[] =
   HELP_TEXT ("- dX,dY: Offsets of the grid.")
   HELP_TEXT ("")
   HELP_TEXT ("")
-  HELP_LINK ("Show/Hide grid : ", SPECIAL_SHOW_GRID)
+  HELP_TEXT ("The following shortcut hides or shows the")
+  HELP_TEXT ("grid in the magnified view:")
+  HELP_LINK ("%s", SPECIAL_SHOW_GRID)
+  HELP_TEXT ("The grid size will be according to your")
+  HELP_TEXT ("snap-to-grid settings.")
+  HELP_TEXT ("")
   HELP_TEXT ("")
   HELP_TITLE("SIEVE")
   HELP_TEXT (" This effect allows you, by defining a")
diff --git a/pxdouble.c b/pxdouble.c
index 41a61f6a..c4f4fd3a 100644
--- a/pxdouble.c
+++ b/pxdouble.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxdouble.h"
 #include "pxwide.h" // for Display_transparent_line_on_screen_wide()
 
diff --git a/pxquad.c b/pxquad.c
index 328d2b81..1b1e328f 100644
--- a/pxquad.c
+++ b/pxquad.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxquad.h"
 
 #define ZOOMX 4
diff --git a/pxsimple.c b/pxsimple.c
index dfce3632..f7bfdebb 100644
--- a/pxsimple.c
+++ b/pxsimple.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxsimple.h"
 
 void Pixel_simple (word x,word y,byte color)
diff --git a/pxtall.c b/pxtall.c
index e1d26a5a..c63df96d 100644
--- a/pxtall.c
+++ b/pxtall.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxtall.h"
 #include "pxsimple.h"
 
diff --git a/pxtall2.c b/pxtall2.c
index 15d35fff..ca4b1b0d 100644
--- a/pxtall2.c
+++ b/pxtall2.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxtall2.h"
 
 #define ZOOMX 2
diff --git a/pxtriple.c b/pxtriple.c
index ae2b5511..99f58efd 100644
--- a/pxtriple.c
+++ b/pxtriple.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxtriple.h"
 
 #define ZOOMX 3
diff --git a/pxwide.c b/pxwide.c
index 7000b2d8..f0d60074 100644
--- a/pxwide.c
+++ b/pxwide.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxwide.h"
 
 #define ZOOMX 2
diff --git a/pxwide2.c b/pxwide2.c
index 336baa97..d0d2f400 100644
--- a/pxwide2.c
+++ b/pxwide2.c
@@ -25,6 +25,7 @@
 #include "global.h"
 #include "sdlscreen.h"
 #include "misc.h"
+#include "graph.h"
 #include "pxwide2.h"
 
 #define ZOOMX 4