14 files changed, 36 insertions, 35 deletions
diff --git a/uidesigner/newformdesigner.pas b/uidesigner/newformdesigner.pas
index b5bd9cad..098f3fd1 100644
--- a/uidesigner/newformdesigner.pas
+++ b/uidesigner/newformdesigner.pas
@@ -24,8 +24,8 @@ interface
 uses
   SysUtils,
   Classes,
-  gfxbase,
-  gfx_widget,
+  fpg_base,
+  fpg_widget,
   gui_form,
   gui_label,
   gui_button,
@@ -167,7 +167,7 @@ var
 implementation
 
 uses
-  fpgfx,
+  fpg_main,
   vfdmain,
   gui_iniutils,
   gui_dialogs;
diff --git a/uidesigner/uidesigner.lpr b/uidesigner/uidesigner.lpr
index 9b75daaa..2ec6834a 100644
--- a/uidesigner/uidesigner.lpr
+++ b/uidesigner/uidesigner.lpr
@@ -23,7 +23,7 @@ uses
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
-  Classes, SysUtils, fpgfx, vfdmain, vfdresizer, vfdforms,
+  Classes, SysUtils, fpg_main, vfdmain, vfdresizer, vfdforms,
   vfdfile, newformdesigner, vfdwidgets, vfdformparser, vfdeditors,
   vfdwidgetclass, vfdutils, vfdprops, vfddesigner, vfdpropeditgrid;
 
diff --git a/uidesigner/vfddesigner.pas b/uidesigner/vfddesigner.pas
index ee1c4477..bd10cfe1 100644
--- a/uidesigner/vfddesigner.pas
+++ b/uidesigner/vfddesigner.pas
@@ -25,9 +25,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget,
+  fpg_base,
+  fpg_main,
+  fpg_widget,
   gui_form,
   gui_dialogs,
   gui_label,
@@ -141,7 +141,8 @@ type
 implementation
 
 uses
-  vfdmain, TypInfo;
+  vfdmain,
+  TypInfo;
 
 
 { TWidgetDesigner }
diff --git a/uidesigner/vfdeditors.pas b/uidesigner/vfdeditors.pas
index 0c4e081f..9860f907 100644
--- a/uidesigner/vfdeditors.pas
+++ b/uidesigner/vfdeditors.pas
@@ -24,7 +24,7 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_widget,
+  fpg_widget,
   gui_label,
   gui_button,
   gui_memo,
@@ -49,8 +49,8 @@ type
 implementation
 
 uses
-  gfxbase,
-  fpgfx;
+  fpg_base,
+  fpg_main;
 
 { TItemEditorForm }
 
diff --git a/uidesigner/vfdfile.pas b/uidesigner/vfdfile.pas
index 16910883..2361e215 100644
--- a/uidesigner/vfdfile.pas
+++ b/uidesigner/vfdfile.pas
@@ -25,7 +25,7 @@ interface
 uses
   SysUtils,
   Classes,
-  gfx_utils;
+  fpg_utils;
 
 type
   TVFDFileBlock = class
@@ -351,8 +351,8 @@ begin
     '{$mode objfpc}{$H+}' + LineEnding + LineEnding +
     'interface' + LineEnding + LineEnding +
     'uses' + LineEnding +
-    '  SysUtils, Classes, gfxbase, fpgfx, gui_edit, ' + LineEnding +
-    '  gfx_widget, gui_form, gui_label, gui_button,' + LineEnding +
+    '  SysUtils, Classes, fpg_base, fpg_main, fpg_widget,' + LineEnding +
+    '  gui_edit, gui_form, gui_label, gui_button,' + LineEnding +
     '  gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, ' + LineEnding +
     '  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, ' + LineEnding +
     '  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,' + LineEnding +
diff --git a/uidesigner/vfdformparser.pas b/uidesigner/vfdformparser.pas
index a3d7c966..5e20fb92 100644
--- a/uidesigner/vfdformparser.pas
+++ b/uidesigner/vfdformparser.pas
@@ -24,8 +24,8 @@ interface
 uses
   Classes,
   SysUtils,
-  fpgfx,
-  gfx_widget,
+  fpg_main,
+  fpg_widget,
   gui_form,
   vfddesigner,
   vfdwidgetclass,
diff --git a/uidesigner/vfdforms.pas b/uidesigner/vfdforms.pas
index 61ce43c2..9b50eeea 100644
--- a/uidesigner/vfdforms.pas
+++ b/uidesigner/vfdforms.pas
@@ -24,8 +24,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  gfx_widget,
+  fpg_base,
+  fpg_widget,
   gui_form,
   gui_label,
   gui_edit,
@@ -130,9 +130,9 @@ type
 implementation
 
 uses
-  fpgfx,
+  fpg_main,
   gui_iniutils,
-  gfx_constants,
+  fpg_constants,
   vfdprops; // used to get Object Inspector defaults
 
 
diff --git a/uidesigner/vfdmain.pas b/uidesigner/vfdmain.pas
index cfa11b31..612def1d 100644
--- a/uidesigner/vfdmain.pas
+++ b/uidesigner/vfdmain.pas
@@ -24,7 +24,7 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_widget,
+  fpg_widget,
   gui_dialogs,
   vfdprops,
   vfdforms,
@@ -84,8 +84,8 @@ implementation
 uses
   vfdformparser,
   gui_iniutils,
-  gfx_utils,
-  fpgfx;
+  fpg_utils,
+  fpg_main;
 
 Var
   DefaultPasExt : String = '.pas';
diff --git a/uidesigner/vfdpropeditgrid.pas b/uidesigner/vfdpropeditgrid.pas
index 209b1d59..1004a56f 100644
--- a/uidesigner/vfdpropeditgrid.pas
+++ b/uidesigner/vfdpropeditgrid.pas
@@ -24,8 +24,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  gfx_widget,
+  fpg_base,
+  fpg_widget,
   gui_form,
   gui_label,
   gui_edit,
diff --git a/uidesigner/vfdprops.pas b/uidesigner/vfdprops.pas
index 0b701c8d..13000c78 100644
--- a/uidesigner/vfdprops.pas
+++ b/uidesigner/vfdprops.pas
@@ -24,8 +24,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  gfx_widget,
+  fpg_base,
+  fpg_widget,
   vfdwidgetclass,
   gui_edit,
   gui_button,
@@ -151,7 +151,7 @@ uses
   TypInfo,
   vfdformparser,
   vfdeditors,
-  fpgfx,
+  fpg_main,
   gui_dialogs;
 
 
diff --git a/uidesigner/vfdresizer.pas b/uidesigner/vfdresizer.pas
index 9944e3b6..32aec2e8 100644
--- a/uidesigner/vfdresizer.pas
+++ b/uidesigner/vfdresizer.pas
@@ -24,8 +24,8 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  gfx_widget;
+  fpg_base,
+  fpg_widget;
 
 type
   TwgResizer = class(TfpgWidget)
diff --git a/uidesigner/vfdutils.pas b/uidesigner/vfdutils.pas
index 90b99841..8a7fd4c3 100644
--- a/uidesigner/vfdutils.pas
+++ b/uidesigner/vfdutils.pas
@@ -24,7 +24,7 @@ interface
 uses
   Classes,
   SysUtils,
-  gfx_widget,
+  fpg_widget,
   gui_form,
   gui_label,
   gui_edit,
diff --git a/uidesigner/vfdwidgetclass.pas b/uidesigner/vfdwidgetclass.pas
index 9729691f..25828d8c 100644
--- a/uidesigner/vfdwidgetclass.pas
+++ b/uidesigner/vfdwidgetclass.pas
@@ -24,9 +24,9 @@ interface
 uses
   Classes,
   SysUtils,
-  gfxbase,
-  fpgfx,
-  gfx_widget;
+  fpg_base,
+  fpg_main,
+  fpg_widget;
 
 type
   TWidgetClass = class of TfpgWidget;
diff --git a/uidesigner/vfdwidgets.pas b/uidesigner/vfdwidgets.pas
index 4f338151..489dee3c 100644
--- a/uidesigner/vfdwidgets.pas
+++ b/uidesigner/vfdwidgets.pas
@@ -41,7 +41,7 @@ var
 implementation
 
 uses
-  fpgfx,
+  fpg_main,
   vfddesigner,
   gui_form,
   gui_label,