* Updated all demos to use the new unit names.

* Updated all packages like ide addons, fpcunit etc to use the new unit names.

104 files changed, 310 insertions, 396 deletions

diff --git a/examples/apps/fpcunit/fpg_guitestrunner.pas b/examples/apps/fpcunit/fpg_guitestrunner.pas
index b7003231..ca1a7f81 100644
--- a/examples/apps/fpcunit/fpg_guitestrunner.pas
+++ b/examples/apps/fpcunit/fpg_guitestrunner.pas
@@ -7,11 +7,11 @@ interface
 uses
   SysUtils, Classes,
   // fpGUI toolkit
-  gfxbase, fpgfx, gui_edit, gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, gui_progressbar,
-  gui_radiobutton, gui_tab, gui_menu, gui_panel, gui_popupcalendar,
-  gui_gauge, gui_splitter, gfx_imagelist,
+  fpg_base, fpg_main, fpg_edit, fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, fpg_progressbar,
+  fpg_radiobutton, fpg_tab, fpg_menu, fpg_panel, fpg_popupcalendar,
+  fpg_gauge, fpg_splitter, fpg_imagelist,
   // FPCUnit support
   fpcunit, testregistry, testdecorator;
 
@@ -83,7 +83,7 @@ type
 implementation
 
 uses
-  gfx_imgfmt_bmp;
+  fpg_imgfmt_bmp;
 
 {@VFD_NEWFORM_IMPL}
 
diff --git a/examples/corelib/canvastest/fpgcanvas.lpi b/examples/corelib/canvastest/fpgcanvas.lpi
index 3bc36356..56117be1 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpi
+++ b/examples/corelib/canvastest/fpgcanvas.lpi
@@ -41,10 +41,9 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
-      <Generate Value="Faster"/>
     </CodeGeneration>
     <Linking>
       <LinkSmart Value="True"/>
diff --git a/examples/corelib/canvastest/fpgcanvas.lpr b/examples/corelib/canvastest/fpgcanvas.lpr
index bf721f28..5db95e09 100644
--- a/examples/corelib/canvastest/fpgcanvas.lpr
+++ b/examples/corelib/canvastest/fpgcanvas.lpr
@@ -7,10 +7,10 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes, SysUtils,
-  gfxbase,
-  fpgfx,
-  gui_form,
-  gfx_imgfmt_bmp;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_imgfmt_bmp;
 
 
 type
diff --git a/examples/corelib/eventtest/eventtest.lpi b/examples/corelib/eventtest/eventtest.lpi
index b1ac640a..b982410c 100644
--- a/examples/corelib/eventtest/eventtest.lpi
+++ b/examples/corelib/eventtest/eventtest.lpi
@@ -40,7 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
       <Optimizations>
diff --git a/examples/corelib/eventtest/eventtest.lpr b/examples/corelib/eventtest/eventtest.lpr
index bdd69c68..baac5d80 100644
--- a/examples/corelib/eventtest/eventtest.lpr
+++ b/examples/corelib/eventtest/eventtest.lpr
@@ -6,7 +6,10 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, GFXBase, fpGFX, gfx_widget;
+  Classes, SysUtils,
+  fpg_base,
+  fpg_main,
+  fpg_widget;
   
 
 const
diff --git a/examples/corelib/helloworld/helloworld.lpi b/examples/corelib/helloworld/helloworld.lpi
index fccf438a..1b678005 100644
--- a/examples/corelib/helloworld/helloworld.lpi
+++ b/examples/corelib/helloworld/helloworld.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/corelib/helloworld/helloworld.pas b/examples/corelib/helloworld/helloworld.pas
index ef8eee98..be6b99c3 100644
--- a/examples/corelib/helloworld/helloworld.pas
+++ b/examples/corelib/helloworld/helloworld.pas
@@ -1,9 +1,7 @@
 {
-    fpGUI  -  Free Pascal GUI Library
+    fpGUI  -  Free Pascal GUI Toolkit
 
-    HelloWorld  -  GFX Hello World application
-
-    Copyright (C) 2007 See the file AUTHORS.txt, included in this
+    Copyright (C) 2006 - 2008 See the file AUTHORS.txt, included in this
     distribution, for details of the copyright.
 
     See the file COPYING.modifiedLGPL, included in this distribution,
@@ -12,6 +10,9 @@
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+    Description:
+      A simple hello world application that only uses canvas painting.
 }
 
 program HelloWorld;
@@ -19,10 +20,9 @@ program HelloWorld;
 {$mode objfpc}{$H+}
 
 uses
-  Classes
-  ,fpGFX
-  ,GFXBase
-  , fpgui_toolkit;
+  Classes,
+  fpg_base,
+  fpg_main;
 
 const
   HelloWorldString: String = 'Hello, world!';
diff --git a/examples/gui/alignment/aligntest.lpi b/examples/gui/alignment/aligntest.lpi
index 3dd0cfa7..586b7b90 100644
--- a/examples/gui/alignment/aligntest.lpi
+++ b/examples/gui/alignment/aligntest.lpi
@@ -39,14 +39,11 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <SearchPaths>
       <IncludeFiles Value="../src/"/>
       <OtherUnitFiles Value="../src/"/>
     </SearchPaths>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/alignment/aligntest.lpr b/examples/gui/alignment/aligntest.lpr
index 47b5adcd..e0fe2506 100644
--- a/examples/gui/alignment/aligntest.lpr
+++ b/examples/gui/alignment/aligntest.lpr
@@ -4,7 +4,7 @@ program aligntest;
 
 uses
   Classes, SysUtils,
-  fpgfx, gfxbase, gfx_widget, gui_form, gui_label;
+  fpg_base, fpg_main, fpg_widget, fpg_form, fpg_label;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/alignment_resize/alignment_resize.lpi b/examples/gui/alignment_resize/alignment_resize.lpi
index 0da35584..e22fcc29 100644
--- a/examples/gui/alignment_resize/alignment_resize.lpi
+++ b/examples/gui/alignment_resize/alignment_resize.lpi
@@ -43,10 +43,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/alignment_resize/alignment_resize.lpr b/examples/gui/alignment_resize/alignment_resize.lpr
index b78745f4..916fab48 100644
--- a/examples/gui/alignment_resize/alignment_resize.lpr
+++ b/examples/gui/alignment_resize/alignment_resize.lpr
@@ -6,8 +6,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, gfxbase, gui_form, gui_button, gui_panel, gui_label,
-  gui_radiobutton, gui_memo;
+  Classes, SysUtils,
+  fpg_base, fpg_main, fpg_form, fpg_button, fpg_panel, fpg_label,
+  fpg_radiobutton, fpg_memo;
 
 type
 
diff --git a/examples/gui/animation/anim_test.lpi b/examples/gui/animation/anim_test.lpi
index 0dad2a2c..b7506331 100644
--- a/examples/gui/animation/anim_test.lpi
+++ b/examples/gui/animation/anim_test.lpi
@@ -41,10 +41,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/animation/anim_test.lpr b/examples/gui/animation/anim_test.lpr
index 10cf9286..79a2bbb8 100644
--- a/examples/gui/animation/anim_test.lpr
+++ b/examples/gui/animation/anim_test.lpr
@@ -8,8 +8,8 @@ uses
   {$ENDIF}{$ENDIF}
   Classes, SysUtils,
   // fpGUI
-  fpgfx, gui_form, gfxbase, gui_button,
-  gui_label, gui_trackbar, gui_animation;
+  fpg_base, fpg_main, fpg_form, fpg_button,
+  fpg_label, fpg_trackbar, fpg_animation;
 
 type
 
diff --git a/examples/gui/bevel/beveltest.lpi b/examples/gui/bevel/beveltest.lpi
index c42423c9..c29961c6 100644
--- a/examples/gui/bevel/beveltest.lpi
+++ b/examples/gui/bevel/beveltest.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/bevel/beveltest.lpr b/examples/gui/bevel/beveltest.lpr
index 3b7deb9d..f3e1a23c 100644
--- a/examples/gui/bevel/beveltest.lpr
+++ b/examples/gui/bevel/beveltest.lpr
@@ -8,11 +8,11 @@ uses
   {$ENDIF}{$ENDIF}
   Classes,
   typinfo,
-  fpgfx,
-  gui_form,
-  gui_button,
-  gui_panel,
-  gui_label;
+  fpg_main,
+  fpg_form,
+  fpg_button,
+  fpg_panel,
+  fpg_label;
   
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/calendar/calendartest.lpi b/examples/gui/calendar/calendartest.lpi
index 20248a00..186cec27 100644
--- a/examples/gui/calendar/calendartest.lpi
+++ b/examples/gui/calendar/calendartest.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/examples/gui/calendar/calendartest.lpr b/examples/gui/calendar/calendartest.lpr
index a38e3727..3b614cb4 100644
--- a/examples/gui/calendar/calendartest.lpr
+++ b/examples/gui/calendar/calendartest.lpr
@@ -10,8 +10,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, gfxbase, fpgfx, gui_form, gui_popupcalendar, gui_edit,
-  gui_button, gui_label, gfx_popupwindow, gui_combobox, gui_checkbox, dateutils;
+  Classes, SysUtils,
+  fpg_base, fpg_main, fpg_form, fpg_popupcalendar, fpg_edit,
+  fpg_button, fpg_label, fpg_popupwindow, fpg_combobox, fpg_checkbox, dateutils;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/colorlistbox/colorlistboxtest.lpi b/examples/gui/colorlistbox/colorlistboxtest.lpi
index 74da94d9..61d9d21e 100644
--- a/examples/gui/colorlistbox/colorlistboxtest.lpi
+++ b/examples/gui/colorlistbox/colorlistboxtest.lpi
@@ -47,10 +47,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Linking>
       <LinkSmart Value="True"/>
     </Linking>
diff --git a/examples/gui/colorlistbox/colorlistboxtest.lpr b/examples/gui/colorlistbox/colorlistboxtest.lpr
index 6bea991c..28bcc183 100644
--- a/examples/gui/colorlistbox/colorlistboxtest.lpr
+++ b/examples/gui/colorlistbox/colorlistboxtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frmMain;
+  Classes, fpg_main, frmMain;
 
 
 procedure MainProc;
diff --git a/examples/gui/colorlistbox/frmMain.pas b/examples/gui/colorlistbox/frmMain.pas
index cc700c4b..6903e1eb 100644
--- a/examples/gui/colorlistbox/frmMain.pas
+++ b/examples/gui/colorlistbox/frmMain.pas
@@ -5,12 +5,9 @@ unit frmMain;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel, gui_popupcalendar, gui_gauge, gui_editcombo;
+  SysUtils, Classes, fpg_base, fpg_main,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_combobox, fpg_dialogs, fpg_checkbox;
 
 type
 
diff --git a/examples/gui/combobox/comboboxtest.lpi b/examples/gui/combobox/comboboxtest.lpi
index c45931bd..45eaa7c1 100644
--- a/examples/gui/combobox/comboboxtest.lpi
+++ b/examples/gui/combobox/comboboxtest.lpi
@@ -51,13 +51,10 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <SearchPaths>
       <OtherUnitFiles Value="../common/"/>
     </SearchPaths>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/combobox/comboboxtest.lpr b/examples/gui/combobox/comboboxtest.lpr
index a3a38da1..32765338 100644
--- a/examples/gui/combobox/comboboxtest.lpr
+++ b/examples/gui/combobox/comboboxtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main;
+  Classes, fpg_main, frm_main;
 
 procedure MainProc;
 var
diff --git a/examples/gui/combobox/frm_main.pas b/examples/gui/combobox/frm_main.pas
index 0f91b314..e1a293df 100644
--- a/examples/gui/combobox/frm_main.pas
+++ b/examples/gui/combobox/frm_main.pas
@@ -5,12 +5,12 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_panel, gui_popupcalendar, gui_gauge, gui_editcombo;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel, fpg_popupcalendar, fpg_gauge, fpg_editcombo;
 
 type
 
diff --git a/examples/gui/command_interface/commands.pas b/examples/gui/command_interface/commands.pas
index aa948220..c487b0b1 100644
--- a/examples/gui/command_interface/commands.pas
+++ b/examples/gui/command_interface/commands.pas
@@ -9,8 +9,8 @@ unit commands;
 interface
 
 uses
-  gfx_command_intf,
-  gui_memo;
+  fpg_command_intf,
+  fpg_memo;
   
 type
   // non reference counted interface
@@ -40,7 +40,7 @@ type
 implementation
 
 uses
-  fpgfx, SysUtils;
+  fpg_main, SysUtils;
 
 { TNullInterfacedObject }
 
diff --git a/examples/gui/command_interface/frm_main.pas b/examples/gui/command_interface/frm_main.pas
index 28bb18cf..bc330130 100644
--- a/examples/gui/command_interface/frm_main.pas
+++ b/examples/gui/command_interface/frm_main.pas
@@ -9,12 +9,12 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel;
 
 type
 
@@ -37,7 +37,7 @@ type
 implementation
 
 uses
-  gfx_command_intf,
+  fpg_command_intf,
   commands;
 
 {@VFD_NEWFORM_IMPL}
diff --git a/examples/gui/command_interface/test.lpi b/examples/gui/command_interface/test.lpi
index 1d0b0ee8..da19eca5 100644
--- a/examples/gui/command_interface/test.lpi
+++ b/examples/gui/command_interface/test.lpi
@@ -50,10 +50,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/examples/gui/command_interface/test.lpr b/examples/gui/command_interface/test.lpr
index dcf20851..f1050002 100644
--- a/examples/gui/command_interface/test.lpr
+++ b/examples/gui/command_interface/test.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, gui_form, frm_main, commands;
+  Classes, fpg_main, frm_main;
 
 
 procedure MainProc;
diff --git a/examples/gui/dbtest/dbtest.lpi b/examples/gui/dbtest/dbtest.lpi
index 847b0588..a7c9efb9 100644
--- a/examples/gui/dbtest/dbtest.lpi
+++ b/examples/gui/dbtest/dbtest.lpi
@@ -47,16 +47,13 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <Parsing>
       <SyntaxOptions>
         <AllowLabel Value="False"/>
         <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/dbtest/dbtest.lpr b/examples/gui/dbtest/dbtest.lpr
index 28d2bd2b..1610cfe4 100644
--- a/examples/gui/dbtest/dbtest.lpr
+++ b/examples/gui/dbtest/dbtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main;
+  Classes, fpg_main, frm_main;
 
 
 procedure MainProc;
diff --git a/examples/gui/dbtest/frm_main.pas b/examples/gui/dbtest/frm_main.pas
index b361ff92..70ca7964 100644
--- a/examples/gui/dbtest/frm_main.pas
+++ b/examples/gui/dbtest/frm_main.pas
@@ -5,9 +5,9 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, fpgfx,
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_bevel, fpgui_db, db, dbf{, dbf_fields};
+  SysUtils, Classes, fpg_main,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_panel, fpgui_db, db, dbf{, dbf_fields};
 
 type
 
diff --git a/examples/gui/edits/edittest.lpi b/examples/gui/edits/edittest.lpi
index ee87a9f5..3938483b 100644
--- a/examples/gui/edits/edittest.lpi
+++ b/examples/gui/edits/edittest.lpi
@@ -41,10 +41,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/edits/edittest.lpr b/examples/gui/edits/edittest.lpr
index fcced01b..937a66f4 100644
--- a/examples/gui/edits/edittest.lpr
+++ b/examples/gui/edits/edittest.lpr
@@ -6,8 +6,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, gui_form, gui_label, gui_edit, gui_button, gui_radiobutton,
-  gui_listbox, gfxbase, gui_checkbox;
+  Classes, SysUtils,
+  fpg_base, fpg_main, fpg_form, fpg_label, fpg_edit, fpg_button, fpg_radiobutton,
+  fpg_listbox, fpg_checkbox;
 
 type
 
diff --git a/examples/gui/filedialog/filedialog.lpi b/examples/gui/filedialog/filedialog.lpi
index d0831d76..2e971703 100644
--- a/examples/gui/filedialog/filedialog.lpi
+++ b/examples/gui/filedialog/filedialog.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/filedialog/filedialog.lpr b/examples/gui/filedialog/filedialog.lpr
index 53e79b9a..676100cc 100644
--- a/examples/gui/filedialog/filedialog.lpr
+++ b/examples/gui/filedialog/filedialog.lpr
@@ -7,13 +7,13 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes,
-  gfxbase,
-  fpgfx,
-  gui_form,
-  gui_dialogs,
-  gui_button,
-  gui_edit,
-  gui_label;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_dialogs,
+  fpg_button,
+  fpg_edit,
+  fpg_label;
 
 
 type
diff --git a/examples/gui/filegrid/filegrid.lpi b/examples/gui/filegrid/filegrid.lpi
index a7ffda2f..1fc73d24 100644
--- a/examples/gui/filegrid/filegrid.lpi
+++ b/examples/gui/filegrid/filegrid.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/filegrid/filegrid.lpr b/examples/gui/filegrid/filegrid.lpr
index b9d24862..6ce51d21 100644
--- a/examples/gui/filegrid/filegrid.lpr
+++ b/examples/gui/filegrid/filegrid.lpr
@@ -8,12 +8,12 @@ uses
   {$ENDIF}{$ENDIF}
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
-  gui_form,
-  gui_grid,
-  gui_checkbox,
-  gui_button;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_grid,
+  fpg_checkbox,
+  fpg_button;
 
 type
 
diff --git a/examples/gui/fontselect/fontselect.lpi b/examples/gui/fontselect/fontselect.lpi
index 52192bab..7e9fd4a0 100644
--- a/examples/gui/fontselect/fontselect.lpi
+++ b/examples/gui/fontselect/fontselect.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/fontselect/fontselect.lpr b/examples/gui/fontselect/fontselect.lpr
index 640eec05..06b3486b 100644
--- a/examples/gui/fontselect/fontselect.lpr
+++ b/examples/gui/fontselect/fontselect.lpr
@@ -7,14 +7,14 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes,
-  fpgfx,
-  gui_form,
-  gui_dialogs,
-  gui_button,
-  gui_listbox,
-  gui_edit,
-  gui_label,
-  gfx_constants;
+  fpg_main,
+  fpg_form,
+  fpg_dialogs,
+  fpg_button,
+  fpg_listbox,
+  fpg_edit,
+  fpg_label,
+  fpg_constants;
   
   
 resourcestring
diff --git a/examples/gui/gauges/gaugetest.lpi b/examples/gui/gauges/gaugetest.lpi
index 9f3bc7fe..60994bb5 100644
--- a/examples/gui/gauges/gaugetest.lpi
+++ b/examples/gui/gauges/gaugetest.lpi
@@ -39,16 +39,13 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <Parsing>
       <SyntaxOptions>
         <AllowLabel Value="False"/>
         <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/gauges/gaugetest.lpr b/examples/gui/gauges/gaugetest.lpr
index 837dd414..3e7de4d4 100644
--- a/examples/gui/gauges/gaugetest.lpr
+++ b/examples/gui/gauges/gaugetest.lpr
@@ -6,19 +6,18 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, Sysutils
-  { you can add units after this },
-  fpgfx,
-  gfxbase,
-  gui_form,
-  gui_button,
-  gui_progressbar,
-  gui_trackbar,
-  gui_label,
-  gfx_imgfmt_bmp,
-  gui_edit,
-  gui_bevel,
-  gui_gauge;
+  Classes, Sysutils,
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_button,
+  fpg_progressbar,
+  fpg_trackbar,
+  fpg_label,
+  fpg_imgfmt_bmp,
+  fpg_edit,
+  fpg_panel,
+  fpg_gauge;
 
 type
 
diff --git a/examples/gui/gridtest/gridtest.lpi b/examples/gui/gridtest/gridtest.lpi
index c048eb69..4dcc44f4 100644
--- a/examples/gui/gridtest/gridtest.lpi
+++ b/examples/gui/gridtest/gridtest.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/gridtest/gridtest.lpr b/examples/gui/gridtest/gridtest.lpr
index fa36442d..c6753332 100644
--- a/examples/gui/gridtest/gridtest.lpr
+++ b/examples/gui/gridtest/gridtest.lpr
@@ -8,15 +8,15 @@ uses
   {$ENDIF}{$ENDIF}
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gui_form,
-  gui_basegrid,
-  gui_grid,
-  gui_button,
-  gui_checkbox,
-  gui_tab,
-  gui_edit;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_basegrid,
+  fpg_grid,
+  fpg_button,
+  fpg_checkbox,
+  fpg_tab,
+  fpg_edit;
 
 
 type
@@ -128,7 +128,7 @@ begin
     ADefaultDrawing := False;
     StringGrid.Canvas.SetColor(clGreen);
     fpgStyle.DrawDirectionArrow(StringGrid.Canvas, ARect.Left, ARect.Top,
-        ARect.Height, ARect.Height, 3);
+        ARect.Height, ARect.Height, adRight);
     StringGrid.Canvas.SetTextColor(clTeal);
     StringGrid.Canvas.DrawString(ARect.Height + ARect.Left + 2, ARect.Top, StringGrid.Cells[ACol, ARow]);
   end;
diff --git a/examples/gui/hintwindow/edittest.lpr b/examples/gui/hintwindow/edittest.lpr
index 3ed9aa24..5e9a97d8 100644
--- a/examples/gui/hintwindow/edittest.lpr
+++ b/examples/gui/hintwindow/edittest.lpr
@@ -6,8 +6,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, gui_form, gui_label, gui_edit, gui_button, gui_radiobutton,
-  gui_listbox, gfxbase, gui_checkbox, gui_panel, gui_hint;
+  Classes, SysUtils,
+  fpg_base, fpg_main, fpg_form, fpg_label, fpg_edit, fpg_button,
+  fpg_radiobutton, fpg_listbox, fpg_checkbox, fpg_panel, fpg_hint;
 
 type
 
diff --git a/examples/gui/imgtest/bitmaptest.lpi b/examples/gui/imgtest/bitmaptest.lpi
index 5b355bac..af74913a 100644
--- a/examples/gui/imgtest/bitmaptest.lpi
+++ b/examples/gui/imgtest/bitmaptest.lpi
@@ -41,14 +41,11 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <SearchPaths>
       <IncludeFiles Value="../source/"/>
       <OtherUnitFiles Value="../source/;../source/x11/;../gui/"/>
     </SearchPaths>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/imgtest/bitmaptest.lpr b/examples/gui/imgtest/bitmaptest.lpr
index 39906e87..010ff886 100644
--- a/examples/gui/imgtest/bitmaptest.lpr
+++ b/examples/gui/imgtest/bitmaptest.lpr
@@ -9,10 +9,10 @@ program bitmaptest;
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_imgfmt_bmp,
-  gui_form;
+  fpg_base,
+  fpg_main,
+  fpg_imgfmt_bmp,
+  fpg_form;
 
 type
 
diff --git a/examples/gui/listbox/frm_main.pas b/examples/gui/listbox/frm_main.pas
index 9757bfc9..38b06d92 100644
--- a/examples/gui/listbox/frm_main.pas
+++ b/examples/gui/listbox/frm_main.pas
@@ -5,12 +5,13 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_panel, gui_popupcalendar, gui_gauge;
+  SysUtils, Classes,
+  fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel, fpg_popupcalendar, fpg_gauge;
 
 type
 
diff --git a/examples/gui/listbox/listboxtest.lpi b/examples/gui/listbox/listboxtest.lpi
index 84d73d9c..c7b0b465 100644
--- a/examples/gui/listbox/listboxtest.lpi
+++ b/examples/gui/listbox/listboxtest.lpi
@@ -46,10 +46,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/listbox/listboxtest.lpr b/examples/gui/listbox/listboxtest.lpr
index f36e2ed8..9353a07c 100644
--- a/examples/gui/listbox/listboxtest.lpr
+++ b/examples/gui/listbox/listboxtest.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main;
+  Classes, fpg_main, frm_main;
 
 procedure MainProc;
 var
diff --git a/examples/gui/listviewtest/listviewtest.lpr b/examples/gui/listviewtest/listviewtest.lpr
index b328aa2b..864687ad 100644
--- a/examples/gui/listviewtest/listviewtest.lpr
+++ b/examples/gui/listviewtest/listviewtest.lpr
@@ -3,8 +3,8 @@ program listviewtest;
 {$mode objfpc}{$H+}
 
 uses
-  Classes, fpgfx, sysutils ,
-  gui_listview, gui_form, gui_button, gui_edit, gfxbase, gui_checkbox;
+  Classes, sysutils,
+  fpg_base, fpg_main, fpg_listview, fpg_form, fpg_button, fpg_edit, fpg_checkbox;
   
 type
 
diff --git a/examples/gui/memo/memotest.lpi b/examples/gui/memo/memotest.lpi
index 6052a169..51f39bef 100644
--- a/examples/gui/memo/memotest.lpi
+++ b/examples/gui/memo/memotest.lpi
@@ -41,10 +41,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Linking>
       <Debugging>
         <GenGProfCode Value="True"/>
diff --git a/examples/gui/memo/memotest.lpr b/examples/gui/memo/memotest.lpr
index e4eed10b..31f5799f 100644
--- a/examples/gui/memo/memotest.lpr
+++ b/examples/gui/memo/memotest.lpr
@@ -8,12 +8,12 @@ uses
   {$ENDIF}{$ENDIF}
   Classes,
   typinfo,
-  fpgfx,
-  gfxbase,
-  gui_form,
-  gui_button,
-  gui_label,
-  gui_memo;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_button,
+  fpg_label,
+  fpg_memo;
   
 type
 
@@ -64,7 +64,7 @@ begin
   //memo.Lines.Delete(1);
   //memo.Lines.Text := 'Dude'+LineEnding+'What''s mine say?'+LineEnding;;
   //memo.Lines.Text := memo.Lines.Text + 'Sweet'+LineEnding;
-  //memo.lines.LoadFromFile('/home/andrew/programming/groupprojects/fpgui/src/gui/gui_memo.pas');
+  //memo.lines.LoadFromFile('/home/andrew/programming/groupprojects/fpgui/src/gui/fpg_memo.pas');
   //memo.lines.LoadFromFile('/usr/share/dict/cracklib-small');
   {memo.lines.Add(memo.lines.text);
   memo.lines.Add(memo.lines.text);
diff --git a/examples/gui/menutest/menutest.lpi b/examples/gui/menutest/menutest.lpi
index f51d54c7..f3d307af 100644
--- a/examples/gui/menutest/menutest.lpi
+++ b/examples/gui/menutest/menutest.lpi
@@ -28,8 +28,7 @@
     </RunParams>
     <RequiredPackages Count="1">
       <Item1>
-        <PackageName Value="fpgui_package"/>
-        <MinVersion Minor="5" Valid="True"/>
+        <PackageName Value="fpgui_toolkit"/>
       </Item1>
     </RequiredPackages>
     <Units Count="1">
@@ -41,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Linking>
       <Debugging>
         <GenerateDebugInfo Value="True"/>
diff --git a/examples/gui/menutest/menutest.lpr b/examples/gui/menutest/menutest.lpr
index 4a8b9244..1db064fb 100644
--- a/examples/gui/menutest/menutest.lpr
+++ b/examples/gui/menutest/menutest.lpr
@@ -7,10 +7,10 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes,
-  fpgfx,
-  gui_form,
-  gui_menu,
-  gui_edit;
+  fpg_main,
+  fpg_form,
+  fpg_menu,
+  fpg_edit;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/modalforms/modalforms.lpi b/examples/gui/modalforms/modalforms.lpi
index ed6fa3a9..7f6f526a 100644
--- a/examples/gui/modalforms/modalforms.lpi
+++ b/examples/gui/modalforms/modalforms.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/modalforms/modalforms.lpr b/examples/gui/modalforms/modalforms.lpr
index 188985e9..99f53ab3 100644
--- a/examples/gui/modalforms/modalforms.lpr
+++ b/examples/gui/modalforms/modalforms.lpr
@@ -12,14 +12,14 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes,
-  fpgfx,
-  gui_form,
-  gui_dialogs,
-  gui_button,
-  gui_label,
-  gui_popupcalendar,
-  gui_combobox,
-  gui_edit;
+  fpg_main,
+  fpg_form,
+  fpg_dialogs,
+  fpg_button,
+  fpg_label,
+  fpg_popupcalendar,
+  fpg_combobox,
+  fpg_edit;
   
 type
   // forward declaration
diff --git a/examples/gui/panel/mainform.pas b/examples/gui/panel/mainform.pas
index c9be22eb..98a8b55b 100644
--- a/examples/gui/panel/mainform.pas
+++ b/examples/gui/panel/mainform.pas
@@ -7,15 +7,15 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfxbase,
-  gui_form,
-  gui_button,
-  gui_label,
-  gui_panel,
-  gui_radiobutton,
-  gui_combobox,
-  gui_checkbox;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_button,
+  fpg_label,
+  fpg_panel,
+  fpg_radiobutton,
+  fpg_combobox,
+  fpg_checkbox;
 
 type
   TfrmMain = class(TfpgForm)
diff --git a/examples/gui/panel/panel_test.lpi b/examples/gui/panel/panel_test.lpi
index ee25dc61..89378ec4 100644
--- a/examples/gui/panel/panel_test.lpi
+++ b/examples/gui/panel/panel_test.lpi
@@ -45,10 +45,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/panel/panel_test.lpr b/examples/gui/panel/panel_test.lpr
index ff0f1fcd..8ae13fff 100644
--- a/examples/gui/panel/panel_test.lpr
+++ b/examples/gui/panel/panel_test.lpr
@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes,
-  fpgfx,
+  fpg_main,
   MainForm;
 
 procedure MainProc;
diff --git a/examples/gui/splashscreen/commands.pas b/examples/gui/splashscreen/commands.pas
index aa948220..c487b0b1 100644
--- a/examples/gui/splashscreen/commands.pas
+++ b/examples/gui/splashscreen/commands.pas
@@ -9,8 +9,8 @@ unit commands;
 interface
 
 uses
-  gfx_command_intf,
-  gui_memo;
+  fpg_command_intf,
+  fpg_memo;
   
 type
   // non reference counted interface
@@ -40,7 +40,7 @@ type
 implementation
 
 uses
-  fpgfx, SysUtils;
+  fpg_main, SysUtils;
 
 { TNullInterfacedObject }
 
diff --git a/examples/gui/splashscreen/frm_main.pas b/examples/gui/splashscreen/frm_main.pas
index 1c2548dd..6835b98a 100644
--- a/examples/gui/splashscreen/frm_main.pas
+++ b/examples/gui/splashscreen/frm_main.pas
@@ -9,12 +9,12 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel;
 
 type
 
@@ -37,7 +37,7 @@ type
 implementation
 
 uses
-  gfx_command_intf,
+  fpg_command_intf,
   commands;
 
 {@VFD_NEWFORM_IMPL}
diff --git a/examples/gui/splashscreen/frm_splashscreen.pas b/examples/gui/splashscreen/frm_splashscreen.pas
index 6001a8ee..46433ab0 100644
--- a/examples/gui/splashscreen/frm_splashscreen.pas
+++ b/examples/gui/splashscreen/frm_splashscreen.pas
@@ -5,12 +5,12 @@ unit frm_splashscreen;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel, gui_popupcalendar, gui_gauge;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel, fpg_popupcalendar, fpg_gauge;
 
 type
 
diff --git a/examples/gui/splashscreen/test.lpi b/examples/gui/splashscreen/test.lpi
index fdc9656c..d347a75a 100644
--- a/examples/gui/splashscreen/test.lpi
+++ b/examples/gui/splashscreen/test.lpi
@@ -55,10 +55,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/splashscreen/test.lpr b/examples/gui/splashscreen/test.lpr
index 008d602b..296caa4f 100644
--- a/examples/gui/splashscreen/test.lpr
+++ b/examples/gui/splashscreen/test.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, gui_form, frm_main, commands, frm_splashscreen;
+  Classes, fpg_main, fpg_form, frm_main, commands, frm_splashscreen;
 
 
 procedure MainProc;
diff --git a/examples/gui/splitter/splitter_test.lpi b/examples/gui/splitter/splitter_test.lpi
index b01ce023..431f5ffe 100644
--- a/examples/gui/splitter/splitter_test.lpi
+++ b/examples/gui/splitter/splitter_test.lpi
@@ -40,7 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <CodeGeneration>
       <SmartLinkUnit Value="True"/>
       <Checks>
@@ -49,7 +49,6 @@
         <OverflowChecks Value="True"/>
         <StackChecks Value="True"/>
       </Checks>
-      <Generate Value="Faster"/>
     </CodeGeneration>
     <Linking>
       <Debugging>
diff --git a/examples/gui/splitter/splitter_test.lpr b/examples/gui/splitter/splitter_test.lpr
index 82374f7a..9aff9293 100644
--- a/examples/gui/splitter/splitter_test.lpr
+++ b/examples/gui/splitter/splitter_test.lpr
@@ -6,9 +6,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  SysUtils, Classes, gfxbase, fpgfx,
-  gui_form, gui_memo, gui_listbox,
-  gui_panel, gui_progressbar, gui_splitter, gui_checkbox;
+  SysUtils, Classes, fpg_base, fpg_main,
+  fpg_form, fpg_memo, fpg_listbox,
+  fpg_panel, fpg_progressbar, fpg_splitter, fpg_checkbox;
 
 type
   { TfrmSplitterTest }
diff --git a/examples/gui/sprites/spritedemo.lpi b/examples/gui/sprites/spritedemo.lpi
index d1a1eff7..d5109e71 100644
--- a/examples/gui/sprites/spritedemo.lpi
+++ b/examples/gui/sprites/spritedemo.lpi
@@ -41,10 +41,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/sprites/spritedemo.lpr b/examples/gui/sprites/spritedemo.lpr
index 12adc82c..5de6e813 100644
--- a/examples/gui/sprites/spritedemo.lpr
+++ b/examples/gui/sprites/spritedemo.lpr
@@ -7,7 +7,7 @@ uses
   cthreads,
   {$ENDIF}{$ENDIF}
   Classes, SysUtils,
-  gfxbase, fpgfx, gui_form, gfx_imgfmt_bmp;
+  fpg_base, fpg_main, fpg_form, fpg_imgfmt_bmp;
 
 type
 
diff --git a/examples/gui/stdimages/stdimglist.lpi b/examples/gui/stdimages/stdimglist.lpi
index 53d35a7e..d136ae4d 100644
--- a/examples/gui/stdimages/stdimglist.lpi
+++ b/examples/gui/stdimages/stdimglist.lpi
@@ -39,10 +39,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/stdimages/stdimglist.lpr b/examples/gui/stdimages/stdimglist.lpr
index 1bcdcb91..c70f6a0d 100644
--- a/examples/gui/stdimages/stdimglist.lpr
+++ b/examples/gui/stdimages/stdimglist.lpr
@@ -4,7 +4,7 @@ program stdimglist;
 
 uses
   Classes, SysUtils,
-  fpgfx, gfxbase, gui_form, gfx_imgfmt_bmp, gui_button;
+  fpg_base, fpg_main, fpg_form, fpg_imgfmt_bmp, fpg_button;
 
 type
 
diff --git a/examples/gui/tabtest/tabtest.lpi b/examples/gui/tabtest/tabtest.lpi
index 5695f0ca..ac64bf44 100644
--- a/examples/gui/tabtest/tabtest.lpi
+++ b/examples/gui/tabtest/tabtest.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/tabtest/tabtest.lpr b/examples/gui/tabtest/tabtest.lpr
index e221e012..46d1a108 100644
--- a/examples/gui/tabtest/tabtest.lpr
+++ b/examples/gui/tabtest/tabtest.lpr
@@ -6,8 +6,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, gfx_widget, gfxbase, gui_form, gui_tab, gui_button,
-  gui_label, gui_edit, gui_checkbox, gui_combobox;
+  Classes,
+  fpg_main, fpg_base, fpg_widget, fpg_form, fpg_tab, fpg_button,
+  fpg_label, fpg_edit, fpg_checkbox, fpg_combobox;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/timertest/timertest.lpi b/examples/gui/timertest/timertest.lpi
index c6e3b9ea..a27e074a 100644
--- a/examples/gui/timertest/timertest.lpi
+++ b/examples/gui/timertest/timertest.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/timertest/timertest.lpr b/examples/gui/timertest/timertest.lpr
index e4189a73..ab7c4fa6 100644
--- a/examples/gui/timertest/timertest.lpr
+++ b/examples/gui/timertest/timertest.lpr
@@ -6,7 +6,8 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, gfxbase, gui_form, gui_button, gui_label;
+  Classes, SysUtils,
+  fpg_base, fpg_main, fpg_form, fpg_button, fpg_label;
 
 type
   TMainForm = class(TfpgForm)
diff --git a/examples/gui/treeviewtest/treeviewtest.lpi b/examples/gui/treeviewtest/treeviewtest.lpi
index 9251c5f5..8941afce 100644
--- a/examples/gui/treeviewtest/treeviewtest.lpi
+++ b/examples/gui/treeviewtest/treeviewtest.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits"/>
       <CompilerPath Value="$(CompPath)"/>
diff --git a/examples/gui/treeviewtest/treeviewtest.lpr b/examples/gui/treeviewtest/treeviewtest.lpr
index f45a07c5..f47f8c37 100644
--- a/examples/gui/treeviewtest/treeviewtest.lpr
+++ b/examples/gui/treeviewtest/treeviewtest.lpr
@@ -8,12 +8,12 @@ uses
   {$ENDIF}{$ENDIF}
   Classes,
   SysUtils,
-  fpgfx,
-  gui_form,
-  gui_tree,
-  gui_checkbox,
-  gfxbase,
-  gfx_imagelist;
+  fpg_base,
+  fpg_main,
+  fpg_form,
+  fpg_tree,
+  fpg_checkbox,
+  fpg_imagelist;
 
 type
 
@@ -60,6 +60,8 @@ begin
   imagelist := TfpgImageList.Create;
   imagelist.AddItemFromFile(SetDirSeparators('../../../images/folder_16.bmp'), 0);
   imagelist.AddItemFromFile(SetDirSeparators('../../../images/menu_preferences_16.bmp'), 1);
+  imagelist.Item[1].Image.CreateMaskFromSample(0, 0);
+  imagelist.Item[1].Image.UpdateImage;
 
   // create a treeview
   tree := TfpgTreeView.Create(self);
diff --git a/examples/gui/wulinetest/wuline_test.lpi b/examples/gui/wulinetest/wuline_test.lpi
index 4a0111f6..7a54bb83 100644
--- a/examples/gui/wulinetest/wuline_test.lpi
+++ b/examples/gui/wulinetest/wuline_test.lpi
@@ -40,10 +40,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 "/>
diff --git a/examples/gui/wulinetest/wuline_test.lpr b/examples/gui/wulinetest/wuline_test.lpr
index 17b4ec3c..57632036 100644
--- a/examples/gui/wulinetest/wuline_test.lpr
+++ b/examples/gui/wulinetest/wuline_test.lpr
@@ -6,8 +6,9 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, gfxbase, fpgfx, gui_form, gui_button, math,
-  gfx_imgfmt_bmp, gfx_wuline, gui_bevel, gui_radiobutton;
+  Classes, SysUtils,
+  fpg_base, fpg_main, fpg_form, fpg_button, math,
+  fpg_imgfmt_bmp, fpg_wuline, fpg_panel, fpg_radiobutton;
 
 type
 
diff --git a/extras/lazarus_ide/fpguilazideintf.pas b/extras/lazarus_ide/fpguilazideintf.pas
index 7eb422d3..d866d506 100644
--- a/extras/lazarus_ide/fpguilazideintf.pas
+++ b/extras/lazarus_ide/fpguilazideintf.pas
@@ -107,7 +107,7 @@ begin
     +'  {$IFDEF UNIX}{$IFDEF UseCThreads}'+le
     +'  cthreads,'+le
     +'  {$ENDIF}{$ENDIF}'+le
-    +'  Classes, fpgfx, gui_form;'+le
+    +'  Classes, fpg_main, fpg_form;'+le
     +le
     +'type'+le
     +le
diff --git a/extras/lazarus_ide/regfpguitestrunner.pas b/extras/lazarus_ide/regfpguitestrunner.pas
index 16ff1254..3a6fd791 100644
--- a/extras/lazarus_ide/regfpguitestrunner.pas
+++ b/extras/lazarus_ide/regfpguitestrunner.pas
@@ -84,7 +84,7 @@ begin
       Add('  cthreads,');
       Add('  {$ENDIF}{$ENDIF}');
       Add('  Classes,');
-      Add('  fpgfx, fpg_guitestrunner;');
+      Add('  fpg_main, fpg_guitestrunner;');
       Add('');
       Add('procedure MainProc;');
       Add('');
diff --git a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi
index a1d58616..3e2e075a 100644
--- a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi
+++ b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi
@@ -28,13 +28,10 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="2">
+    <RequiredPackages Count="1">
       <Item1>
         <PackageName Value="tiOPFfpGUI"/>
       </Item1>
-      <Item2>
-        <PackageName Value="fpgui_package"/>
-      </Item2>
     </RequiredPackages>
     <Units Count="2">
       <Unit0>
@@ -50,16 +47,13 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <Parsing>
       <SyntaxOptions>
         <AllowLabel Value="False"/>
         <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits
 -dUseCThreads"/>
diff --git a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr
index 3e97bf30..8e966dc7 100644
--- a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr
+++ b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr
@@ -6,7 +6,8 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, frm_main, tiOPFManager, tiConstants;
+  Classes, SysUtils,
+  fpg_main, frm_main, tiOPFManager, tiConstants;
 
 
 procedure MainProc;
diff --git a/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas b/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas
index 87e2d08e..f413aa38 100644
--- a/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas
+++ b/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas
@@ -5,9 +5,9 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, fpgfx,
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_memo, gui_dialogs;
+  SysUtils, Classes,
+  fpg_main, fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_memo, fpg_dialogs;
 
 type
 
diff --git a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi
index c07629aa..a4d89aea 100644
--- a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi
+++ b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi
@@ -29,13 +29,10 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <RequiredPackages Count="2">
+    <RequiredPackages Count="1">
       <Item1>
         <PackageName Value="tiOPFfpGUI"/>
       </Item1>
-      <Item2>
-        <PackageName Value="fpgui_package"/>
-      </Item2>
     </RequiredPackages>
     <Units Count="3">
       <Unit0>
@@ -56,16 +53,13 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
+    <Version Value="8"/>
     <Parsing>
       <SyntaxOptions>
         <AllowLabel Value="False"/>
         <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
     <Other>
       <CustomOptions Value="-FUunits
 -dUseCThreads"/>
diff --git a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr
index 9a7ccd15..125dd248 100644
--- a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr
+++ b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main, tiOIDGUID, tiOPFManager, Client_BOM;
+  Classes, fpg_main, frm_main, tiOIDGUID, tiOPFManager, Client_BOM;
 
 
 procedure MainProc;
diff --git a/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas b/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas
index 526823ee..8a10f2df 100644
--- a/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas
+++ b/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   SysUtils, Classes,
-  fpgfx, gui_form, gui_button,
+  fpg_main, fpg_form, fpg_button,
   Client_BOM;
 
 type
diff --git a/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr b/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr
index 67acbdd2..c1d14863 100644
--- a/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr
+++ b/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr
@@ -10,7 +10,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, frm_main,
+  Classes, SysUtils, fpg_main, frm_main,
   Client_DBIndependentVisitors_Svr, Client_BOM,
   Client_AutoMap_Svr, Client_HardCodedVisitors_Svr, tiOPFManager,
   tiConstants{, tiLog, tiLogToConsole};
diff --git a/extras/tiopf/demos/Demo_08_Collection/frm_main.pas b/extras/tiopf/demos/Demo_08_Collection/frm_main.pas
index cb269a6b..170ef96b 100644
--- a/extras/tiopf/demos/Demo_08_Collection/frm_main.pas
+++ b/extras/tiopf/demos/Demo_08_Collection/frm_main.pas
@@ -5,12 +5,12 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel, Client_BOM, tiFormMediator;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel, Client_BOM, tiFormMediator;
 
 type
 
diff --git a/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr b/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr
index 3b66ebde..5db2a346 100644
--- a/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr
+++ b/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frmMain, Model, Constants, Model_View;
+  Classes, fpg_main, frmMain, Model, Constants, Model_View;
 
 
 procedure MainProc;
diff --git a/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas b/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas
index 40c108e5..85a51e30 100644
--- a/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas
+++ b/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas
@@ -5,8 +5,8 @@ unit frmMain;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gfx_widget, gui_form, gui_button,
-  gui_grid, gui_checkbox, gui_panel, gui_listview, gui_listbox,
+  SysUtils, Classes, fpg_base, fpg_main, fpg_widget, fpg_form, fpg_button,
+  fpg_grid, fpg_checkbox, fpg_panel, fpg_listview, fpg_listbox, fpg_combobox,
   Model, tiFormMediator, tiMediators;
 
 type
@@ -108,7 +108,7 @@ begin
   FMediator.Subject := FPersonList;
   FMediator.Active := True;
 
-  medCombo := TMediatorComboBoxView.CreateCustom(cbName1, FPerson);
+//  medCombo := TMediatorComboBoxView.CreateCustom(cbName1, FPerson);
 end;
 
 constructor TMainForm.Create(AOwner: TComponent);
diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr
index f062e4d8..d5e48414 100644
--- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr
+++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frmmain, frmcontactmaint, frmCityList, frmcitymaint,
+  Classes, fpg_main, frmmain, frmcontactmaint, frmCityList, frmcitymaint,
   frmcountrylist, frmaddressmaint;
 
 
diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas
index 1b042cd9..8314e59f 100644
--- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas
+++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas
@@ -5,12 +5,12 @@ unit frmAddressMaint;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_panel, gui_popupcalendar, gui_gauge,
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel, fpg_popupcalendar, fpg_gauge,
   model, tiFormMediator;
 
 type
diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas
index 37143a72..f14c13ee 100644
--- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas
+++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas
@@ -5,10 +5,10 @@ unit frmCityList;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx,
-  gfx_widget, gui_form, gui_button,
-  gui_grid, gui_dialogs, gui_menu,
-  gui_panel,
+  SysUtils, Classes, fpg_base, fpg_main,
+  fpg_widget, fpg_form, fpg_button,
+  fpg_grid, fpg_dialogs, fpg_menu,
+  fpg_panel,
   tiFormMediator, model;
 
 type
diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas
index d2f281a0..31a6326d 100644
--- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas
+++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas
@@ -5,9 +5,9 @@ unit frmCityMaint;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_dialogs, gui_combobox,
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_dialogs, fpg_combobox,
   model, tiFormMediator;
 
 type
diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas
index f78dc0f3..b166c05e 100644
--- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas
+++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas
@@ -5,9 +5,9 @@ unit frmContactMaint;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listview, gui_memo,
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listview, fpg_memo,
   model, tiFormMediator;
 
 type
diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas
index 104e8137..7bed804d 100644
--- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas
+++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas
@@ -5,12 +5,12 @@ unit frmCountryList;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_panel, gui_popupcalendar, gui_gauge,
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel, fpg_popupcalendar, fpg_gauge,
   model, tiFormMediator;
 
 type
diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas
index df6edbf1..2e13aa09 100644
--- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas
+++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas
@@ -5,10 +5,10 @@ unit frmmain;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_basegrid, gui_grid, gui_dialogs, gui_menu,
-  gui_panel, gui_popupcalendar, gui_gauge, tiFormMediator;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_basegrid, fpg_grid, fpg_dialogs, fpg_menu,
+  fpg_panel, fpg_popupcalendar, fpg_gauge, tiFormMediator;
 
 type
   { The main application window }
diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi
index 4d24712d..08c1bbe6 100644
--- a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi
+++ b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi
@@ -28,8 +28,7 @@
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
-        <PackageName Value="fpgui_package"/>
-        <MinVersion Minor="5" Release="1" Valid="True"/>
+        <PackageName Value="fpgui_toolkit"/>
       </Item1>
       <Item2>
         <PackageName Value="tiOPF"/>
@@ -48,10 +47,7 @@
     </Units>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CustomOptions Value="-FUunits
 -dUseCThreads
diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr
index 85ac297a..e43592fd 100644
--- a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr
+++ b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr
@@ -8,7 +8,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frm_main;
+  Classes, fpg_main, frm_main;
 
 
 procedure MainProc;
diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas b/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas
index e4aec833..6b39cf0d 100644
--- a/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas
+++ b/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas
@@ -10,12 +10,12 @@ unit frm_main;
 interface
 
 uses
-  SysUtils, Classes, gfxbase, fpgfx, gui_edit, 
-  gfx_widget, gui_form, gui_label, gui_button,
-  gui_listbox, gui_memo, gui_combobox, gui_grid, 
-  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, 
-  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,
-  gui_bevel, gui_popupcalendar, gui_gauge;
+  SysUtils, Classes, fpg_base, fpg_main, fpg_edit,
+  fpg_widget, fpg_form, fpg_label, fpg_button,
+  fpg_listbox, fpg_memo, fpg_combobox, fpg_grid,
+  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar,
+  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,
+  fpg_panel, fpg_popupcalendar, fpg_gauge;
 
 type
 
diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi b/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi
index bb61968c..a7940dba 100644
--- a/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi
+++ b/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi
@@ -32,7 +32,7 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="performancetest"/>
         <CursorPos X="1" Y="13"/>
-        <TopLine Value="1"/>
+        <TopLine Value="43"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="20"/>
         <Loaded Value="True"/>
@@ -47,7 +47,7 @@
         <Loaded Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="/opt/fpc_2.2.0/src/packages/fcl-base/src/inc/custapp.pp"/>
+        <Filename Value="../../../../../../../../opt/fpc_2.2.0/src/packages/fcl-base/src/inc/custapp.pp"/>
         <UnitName Value="CustApp"/>
         <CursorPos X="3" Y="26"/>
         <TopLine Value="11"/>
@@ -70,14 +70,14 @@
       <Unit5>
         <Filename Value="../../../../../3rdParty/tiOPF2/Source/Core/tiBaseObject.pas"/>
         <UnitName Value="tiBaseObject"/>
-        <CursorPos X="1" Y="658"/>
-        <TopLine Value="631"/>
+        <CursorPos X="1" Y="128"/>
+        <TopLine Value="94"/>
         <EditorIndex Value="3"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit5>
       <Unit6>
-        <Filename Value="/opt/fpc_2.2.0/src/rtl/inc/objpash.inc"/>
+        <Filename Value="../../../../../../../../opt/fpc_2.2.0/src/rtl/inc/objpash.inc"/>
         <CursorPos X="29" Y="220"/>
         <TopLine Value="212"/>
         <EditorIndex Value="1"/>
@@ -85,7 +85,7 @@
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
-        <Filename Value="/opt/fpc_2.2.0/src/rtl/inc/objpas.inc"/>
+        <Filename Value="../../../../../../../../opt/fpc_2.2.0/src/rtl/inc/objpas.inc"/>
         <CursorPos X="9" Y="709"/>
         <TopLine Value="705"/>
         <EditorIndex Value="2"/>
@@ -112,10 +112,7 @@
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
-    <Version Value="5"/>
-    <CodeGeneration>
-      <Generate Value="Faster"/>
-    </CodeGeneration>
+    <Version Value="8"/>
     <Other>
       <CompilerPath Value="$(CompPath)"/>
     </Other>
diff --git a/extras/tiopf/demos/EditControlsDemo/editmediators.lpr b/extras/tiopf/demos/EditControlsDemo/editmediators.lpr
index 7e462e83..0dd11cc8 100644
--- a/extras/tiopf/demos/EditControlsDemo/editmediators.lpr
+++ b/extras/tiopf/demos/EditControlsDemo/editmediators.lpr
@@ -6,7 +6,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, fpgfx, frmMain;
+  Classes, fpg_main, frmMain;
 
 
 
diff --git a/extras/tiopf/demos/EditControlsDemo/frmMain.pas b/extras/tiopf/demos/EditControlsDemo/frmMain.pas
index 7e85f4a2..75719922 100644
--- a/extras/tiopf/demos/EditControlsDemo/frmMain.pas
+++ b/extras/tiopf/demos/EditControlsDemo/frmMain.pas
@@ -5,8 +5,8 @@ unit frmMain;
 interface
 
 uses
-  Classes, SysUtils, gui_form, gui_button, gui_label, gui_edit, gui_trackbar,
-  gui_combobox, gui_memo, Model, tiFormMediator, Model_View;
+  Classes, SysUtils, fpg_form, fpg_button, fpg_label, fpg_edit, fpg_trackbar,
+  fpg_combobox, fpg_memo, Model, tiFormMediator, Model_View;
 
 type
   TMainForm = class(TfpgForm)
@@ -41,7 +41,7 @@ type
 implementation
 
 uses
-  gui_dialogs
+  fpg_dialogs
   ;
 
 { TMainForm }
diff --git a/src/build.sh b/src/build.sh
index 80f4c4c3..a067b849 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -1,2 +1,15 @@
+#!/bin/bash
+
+fpctarget=`fpc -iTP`-`fpc -iTO`
+#echo $fpctarget
+libpath='../lib/'$fpctarget
+
+# Must we create the output directory?
+if [ ! -d $libpath ]; then
+  echo 'creating directory: '$libpath
+  mkdir $libpath
+  echo ' '
+fi
+
 fpc -dRELEASE -dX11 @extrafpc.cfg corelib/x11/fpgui_toolkit.pas
 
diff --git a/src/extrafpc.cfg b/src/extrafpc.cfg
index 66abc58b..8757773c 100644
--- a/src/extrafpc.cfg
+++ b/src/extrafpc.cfg
@@ -79,7 +79,7 @@
 
 
 # Unit output path
--FU../lib
+-FU../lib/$fpctarget/
 
 # Generate debugging information for GDI (slows down the compiling process)
 # Enable debug info and use the line info unit by default