diff --git a/Base/BaseD7.dcp b/Base/BaseD7.dcp
index 9492e2b..ffcf4f1 100644
Binary files a/Base/BaseD7.dcp and b/Base/BaseD7.dcp differ
diff --git a/Base/uDataModuleBase.dfm b/Base/uDataModuleBase.dfm
index d4f7c29..445a401 100644
--- a/Base/uDataModuleBase.dfm
+++ b/Base/uDataModuleBase.dfm
@@ -1,8 +1,8 @@
 object dmBase: TdmBase
   OldCreateOrder = True
   OnCreate = DAClientDataModuleCreate
-  Left = 240
-  Top = 499
+  Left = 191
+  Top = 130
   Height = 376
   Width = 502
   object SmallImages: TPngImageList
diff --git a/Base/uEditorBase.dfm b/Base/uEditorBase.dfm
index a6f12ee..5160d73 100644
--- a/Base/uEditorBase.dfm
+++ b/Base/uEditorBase.dfm
@@ -1,8 +1,8 @@
 object fEditorBase: TfEditorBase
-  Left = 510
-  Top = 423
-  Width = 674
-  Height = 516
+  Left = 4
+  Top = 3
+  Width = 638
+  Height = 444
   Caption = 'EditorBase'
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
@@ -22,7 +22,7 @@ object fEditorBase: TfEditorBase
   object JvNavPanelHeader: TJvNavPanelHeader
     Left = 0
     Top = 0
-    Width = 666
+    Width = 630
     Align = alTop
     Caption = 'Editor'
     Font.Charset = DEFAULT_CHARSET
@@ -37,7 +37,7 @@ object fEditorBase: TfEditorBase
     StyleManager = dmBase.StyleManager
     ParentStyleManager = False
     object Image1: TImage
-      Left = 639
+      Left = 603
       Top = 0
       Width = 27
       Height = 27
@@ -68,7 +68,7 @@ object fEditorBase: TfEditorBase
   object TBXDock: TTBXDock
     Left = 0
     Top = 27
-    Width = 666
+    Width = 630
     Height = 49
     AllowDrag = False
     object tbxMain: TTBXToolbar
@@ -243,8 +243,8 @@ object fEditorBase: TfEditorBase
   end
   object StatusBar: TStatusBar
     Left = 0
-    Top = 463
-    Width = 666
+    Top = 391
+    Width = 630
     Height = 19
     Panels = <
       item
diff --git a/Base/uEditorDBBase.dfm b/Base/uEditorDBBase.dfm
index 01c4371..4eed530 100644
--- a/Base/uEditorDBBase.dfm
+++ b/Base/uEditorDBBase.dfm
@@ -1,6 +1,4 @@
 inherited fEditorDBBase: TfEditorDBBase
-  Left = 482
-  Top = 361
   Caption = 'fEditorDBBase'
   PixelsPerInch = 96
   TextHeight = 13
diff --git a/Base/uEditorDBItem.dfm b/Base/uEditorDBItem.dfm
index 2f43118..3ac3836 100644
--- a/Base/uEditorDBItem.dfm
+++ b/Base/uEditorDBItem.dfm
@@ -1,6 +1,4 @@
 inherited fEditorDBItem: TfEditorDBItem
-  Left = 557
-  Top = 313
   BorderIcons = [biSystemMenu, biMaximize]
   Caption = 'fEditorDBItem'
   PixelsPerInch = 96
@@ -23,8 +21,8 @@ inherited fEditorDBItem: TfEditorDBItem
   object pgPaginas: TPageControl [2]
     Left = 0
     Top = 76
-    Width = 666
-    Height = 387
+    Width = 630
+    Height = 315
     ActivePage = pagGeneral
     Align = alClient
     TabOrder = 2
diff --git a/Base/uEditorDBItem.pas b/Base/uEditorDBItem.pas
index 5ea6b1c..f70b972 100644
--- a/Base/uEditorDBItem.pas
+++ b/Base/uEditorDBItem.pas
@@ -56,7 +56,7 @@ begin
       '¿Desea guardarlos ahora?', 'Atención', MB_YESNO) = IDYES) then
       actGuardar.Execute
     else begin
-      Application.MessageBox('Recuerde guardar los cambios si quiere previsualizar o imprimir.', 'FactuGES', MB_OK);
+      Application.MessageBox('Recuerde guardar los cambios si quiere previsualizar o imprimir.', 'ProGestion', MB_OK);
       Exit;
     end;
   end;
@@ -78,7 +78,7 @@ begin
       '¿Desea guardarlos ahora?', 'Atención', MB_YESNO) = IDYES) then
       actGuardar.Execute
     else begin
-      Application.MessageBox('Recuerde guardar los cambios si quiere previsualizar o imprimir.', 'FactuGES', MB_OK);
+      Application.MessageBox('Recuerde guardar los cambios si quiere previsualizar o imprimir.', 'ProGestion', MB_OK);
       Exit;
     end;
   end;
diff --git a/Base/uEditorGrid.dfm b/Base/uEditorGrid.dfm
index 6ba1027..eb57210 100644
--- a/Base/uEditorGrid.dfm
+++ b/Base/uEditorGrid.dfm
@@ -1,19 +1,8 @@
 inherited fEditorGrid: TfEditorGrid
-  Left = 468
-  Top = 365
-  Width = 719
-  Height = 489
   Caption = 'fEditorGrid'
   PixelsPerInch = 96
   TextHeight = 13
-  inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 711
-    inherited Image1: TImage
-      Left = 684
-    end
-  end
   inherited TBXDock: TTBXDock
-    Width = 711
     inherited tbxMain: TTBXToolbar
       DefaultDock = TBXDock
       inherited TBXItem29: TTBXItem
@@ -49,7 +38,7 @@ inherited fEditorGrid: TfEditorGrid
       end
     end
     object tbxFiltro: TTBXToolbar
-      Left = 442
+      Left = 420
       Top = 23
       Align = alRight
       CloseButton = False
@@ -82,14 +71,10 @@ inherited fEditorGrid: TfEditorGrid
       end
     end
   end
-  inherited StatusBar: TStatusBar
-    Top = 436
-    Width = 711
-  end
   inline frViewBarraSeleccion: TfrViewBarraSeleccion [3]
     Left = 0
-    Top = 398
-    Width = 711
+    Top = 353
+    Width = 630
     Height = 38
     Align = alBottom
     AutoScroll = False
@@ -103,12 +88,12 @@ inherited fEditorGrid: TfEditorGrid
     Visible = False
     ReadOnly = False
     inherited pnlSeleccion: TPanel
-      Width = 711
+      Width = 630
       inherited bSeleccionar: TButton
-        Left = 536
+        Left = 455
       end
       inherited bCancelar: TButton
-        Left = 615
+        Left = 534
       end
     end
   end
diff --git a/Base/uEditorGrid.pas b/Base/uEditorGrid.pas
index 3048c0c..6ad98f9 100644
--- a/Base/uEditorGrid.pas
+++ b/Base/uEditorGrid.pas
@@ -175,15 +175,15 @@ end;
 procedure TfEditorGrid.JvFormStorageSavePlacement(Sender: TObject);
 begin
   inherited;
-  if Assigned(ViewGrid) then
-    ViewGrid.StoreToRegistry;
+  {if Assigned(ViewGrid) then
+    ViewGrid.StoreToRegistry;}
 end;
 
 procedure TfEditorGrid.JvFormStorageRestorePlacement(Sender: TObject);
 begin
   inherited;
-  if Assigned(ViewGrid) then
-    ViewGrid.RestoreFromRegistry;
+  {if Assigned(ViewGrid) then
+    ViewGrid.RestoreFromRegistry;}
 end;
 
 procedure TfEditorGrid.actRefrescarExecute(Sender: TObject);
diff --git a/Base/uViewDireccion.dfm b/Base/uViewDireccion.dfm
index a4af3d5..a84cd04 100644
--- a/Base/uViewDireccion.dfm
+++ b/Base/uViewDireccion.dfm
@@ -11,10 +11,12 @@ inherited frViewDireccion: TfrViewDireccion
     TabOrder = 0
     AutoContentSizes = [acsWidth]
     object eProvincia: TcxDBTextEdit
-      Left = 272
+      Left = 274
       Top = 82
       DataBinding.DataField = 'PROVINCIA'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -27,10 +29,12 @@ inherited frViewDireccion: TfrViewDireccion
       Width = 70
     end
     object eCalle: TcxDBTextEdit
-      Left = 94
+      Left = 96
       Top = 28
       DataBinding.DataField = 'CALLE'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -43,10 +47,12 @@ inherited frViewDireccion: TfrViewDireccion
       Width = 272
     end
     object ePoblacion: TcxDBTextEdit
-      Left = 94
+      Left = 96
       Top = 55
       DataBinding.DataField = 'POBLACION'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -59,10 +65,12 @@ inherited frViewDireccion: TfrViewDireccion
       Width = 272
     end
     object eCodigoPostal: TcxDBTextEdit
-      Left = 94
+      Left = 96
       Top = 82
       DataBinding.DataField = 'CODIGOPOSTAL'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
diff --git a/Base/uViewGrid.dfm b/Base/uViewGrid.dfm
index d7fe434..43d13fb 100644
--- a/Base/uViewGrid.dfm
+++ b/Base/uViewGrid.dfm
@@ -81,7 +81,7 @@ inherited frViewGrid: TfrViewGrid
       PrinterPage.PageSize.Y = 297000
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39000.667590601850000000
+      ReportDocument.CreationDate = 40521.697641412040000000
       OptionsCharts.Transparent = True
       OptionsFormatting.SuppressBackgroundBitmaps = True
       OptionsOnEveryPage.Caption = False
diff --git a/Base/uViewGrid.pas b/Base/uViewGrid.pas
index b9c9330..300dff8 100644
--- a/Base/uViewGrid.pas
+++ b/Base/uViewGrid.pas
@@ -379,12 +379,12 @@ end;
 
 procedure TfrViewGrid.RestoreFromRegistry;
 begin
-  cxGridView.RestoreFromRegistry('Software\\FactuGES\\GridSettings\\' + Self.Name, False, False, []);
+//  cxGridView.RestoreFromRegistry('Software\\FactuGES\\GridSettings\\' + Self.Name, False, False, []);
 end;
 
 procedure TfrViewGrid.StoreToRegistry;
 begin
-  cxGridView.StoreToRegistry('Software\\FactuGES\\GridSettings\\' + Self.Name, True, []);
+//  cxGridView.StoreToRegistry('Software\\FactuGES\\GridSettings\\' + Self.Name, True, []);
 end;
 
 procedure TfrViewGrid.FilterChanged(Sender: TObject);
diff --git a/Base/uViewInternet.dfm b/Base/uViewInternet.dfm
index 8d6a87a..5b505d4 100644
--- a/Base/uViewInternet.dfm
+++ b/Base/uViewInternet.dfm
@@ -271,7 +271,7 @@ inherited frViewInternet: TfrViewInternet
     Left = 432
     Top = 8
     Bitmap = {
-      494C010102000400040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
+      494C010102000400040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000001000000001002000000000000010
       00000000000000000000000000000000000000000000B7A29300694731006947
       3100694731006947310069473100694731006947310069473100694731000000
@@ -407,6 +407,7 @@ inherited frViewInternet: TfrViewInternet
       801F800100000000801F000100000000801F000000000000A01F000000000000
       B000000000000000B800000000000000BC00000000000000BE00000000000000
       BE000000000000008000000000000000EF00800100000000E980800100000000
-      EFC0C00300000000E000F00F00000000}
+      EFC0C00300000000E000F00F0000000000000000000000000000000000000000
+      000000000000}
   end
 end
diff --git a/Base/uViewObservaciones.dfm b/Base/uViewObservaciones.dfm
index bf4edd3..858125d 100644
--- a/Base/uViewObservaciones.dfm
+++ b/Base/uViewObservaciones.dfm
@@ -16,6 +16,8 @@ inherited frViewObservaciones: TfrViewObservaciones
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
       Properties.ScrollBars = ssVertical
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
diff --git a/Base/uViewTelefonos.dfm b/Base/uViewTelefonos.dfm
index 1747c2c..df54191 100644
--- a/Base/uViewTelefonos.dfm
+++ b/Base/uViewTelefonos.dfm
@@ -11,10 +11,12 @@ inherited frViewTelefonos: TfrViewTelefonos
     TabOrder = 0
     AutoContentSizes = [acsWidth]
     object eTlfParticular: TcxDBTextEdit
-      Left = 87
+      Left = 90
       Top = 28
       DataBinding.DataField = 'TELEFONO2'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -27,10 +29,12 @@ inherited frViewTelefonos: TfrViewTelefonos
       Width = 326
     end
     object eTlfTrabajo: TcxDBTextEdit
-      Left = 87
+      Left = 90
       Top = 55
       DataBinding.DataField = 'TELEFONO1'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -43,10 +47,12 @@ inherited frViewTelefonos: TfrViewTelefonos
       Width = 326
     end
     object eTlfMovil: TcxDBTextEdit
-      Left = 87
+      Left = 90
       Top = 82
       DataBinding.DataField = 'MOVIL'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -59,10 +65,12 @@ inherited frViewTelefonos: TfrViewTelefonos
       Width = 326
     end
     object eFax: TcxDBTextEdit
-      Left = 87
+      Left = 90
       Top = 109
       DataBinding.DataField = 'FAX'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
diff --git a/Modulos/Calendarios/Cliente/Calendarios.cfg b/Modulos/Calendarios/Cliente/Calendarios.cfg
index 4af03f3..43daa45 100644
--- a/Modulos/Calendarios/Cliente/Calendarios.cfg
+++ b/Modulos/Calendarios/Cliente/Calendarios.cfg
@@ -24,7 +24,6 @@
 -$X+
 -$YD
 -$Z1
--GD
 -cg
 -AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
 -H+
@@ -35,10 +34,10 @@
 -N".\"
 -LE"..\..\..\Output\Cliente"
 -LN".\"
--U"c:\archivos de programa\borland\delphi7\Lib\Debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\Usuarios;..\Reglas;..\Cliente"
--O"c:\archivos de programa\borland\delphi7\Lib\Debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\Usuarios;..\Reglas;..\Cliente"
--I"c:\archivos de programa\borland\delphi7\Lib\Debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\Usuarios;..\Reglas;..\Cliente"
--R"c:\archivos de programa\borland\delphi7\Lib\Debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\Usuarios;..\Reglas;..\Cliente"
+-U"c:\archivos de programa\borland\delphi7\Lib\Debug;E:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\GUISDK\lib\d7;..\..\Contactos\Cliente;..\..\Documentos asociados;..\Reglas"
+-O"c:\archivos de programa\borland\delphi7\Lib\Debug;E:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\GUISDK\lib\d7;..\..\Contactos\Cliente;..\..\Documentos asociados;..\Reglas"
+-I"c:\archivos de programa\borland\delphi7\Lib\Debug;E:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\GUISDK\lib\d7;..\..\Contactos\Cliente;..\..\Documentos asociados;..\Reglas"
+-R"c:\archivos de programa\borland\delphi7\Lib\Debug;E:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;D:\PROYEC~1\COMPON~1\jcl\lib\D7\debug;..\..\..\Base;..\..\..\Servidor;..\..\..\GUISDK\lib\d7;..\..\Contactos\Cliente;..\..\Documentos asociados;..\Reglas"
 -Z
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE
diff --git a/Modulos/Calendarios/Servidor/srvCitas_Impl.dfm b/Modulos/Calendarios/Servidor/srvCitas_Impl.dfm
index 6d6c521..c0eb683 100644
--- a/Modulos/Calendarios/Servidor/srvCitas_Impl.dfm
+++ b/Modulos/Calendarios/Servidor/srvCitas_Impl.dfm
@@ -5,8 +5,8 @@ object srvCitas: TsrvCitas
   ConnectionName = 'IBX'
   ServiceSchema = schCitas
   ServiceAdapter = DABINAdapter
-  Left = 503
-  Top = 207
+  Left = 394
+  Top = 211
   Height = 184
   Width = 245
   object schCitas: TDASchema
diff --git a/Modulos/Contactos/Cliente/Contactos.dcp b/Modulos/Contactos/Cliente/Contactos.dcp
index cb6fd16..4cb892e 100644
Binary files a/Modulos/Contactos/Cliente/Contactos.dcp and b/Modulos/Contactos/Cliente/Contactos.dcp differ
diff --git a/Modulos/Contactos/Cliente/uEditorContacto.dfm b/Modulos/Contactos/Cliente/uEditorContacto.dfm
index 9f9d83e..fa81a46 100644
--- a/Modulos/Contactos/Cliente/uEditorContacto.dfm
+++ b/Modulos/Contactos/Cliente/uEditorContacto.dfm
@@ -1,25 +1,25 @@
 inherited fEditorContacto: TfEditorContacto
-  Left = 31
-  Top = 43
-  Width = 969
-  Height = 700
+  Left = 0
+  Top = 2
+  Width = 652
+  Height = 492
   HorzScrollBar.Visible = False
   VertScrollBar.Visible = False
   Caption = 'Contacto'
-  Constraints.MinHeight = 700
-  Constraints.MinWidth = 800
+  Constraints.MinHeight = 492
+  Constraints.MinWidth = 652
   Scaled = False
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 961
+    Width = 644
     Caption = 'Contacto'
     inherited Image1: TImage
-      Left = 934
+      Left = 617
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 961
+    Width = 644
     inherited tbxMain: TTBXToolbar
       inherited TBXItem2: TTBXItem
         Visible = False
@@ -37,14 +37,14 @@ inherited fEditorContacto: TfEditorContacto
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 961
-    Height = 571
+    Width = 644
+    Height = 363
     inherited pagGeneral: TTabSheet
       inline frViewContacto1: TfrViewContacto
         Left = 0
         Top = 0
-        Width = 953
-        Height = 543
+        Width = 636
+        Height = 335
         Align = alClient
         AutoSize = True
         Font.Charset = DEFAULT_CHARSET
@@ -56,8 +56,8 @@ inherited fEditorContacto: TfEditorContacto
         TabOrder = 0
         ReadOnly = False
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 953
-          Height = 543
+          Width = 636
+          Height = 335
           inherited frViewDatosGenerales1: TfrViewDatosGenerales
             Width = 454
             inherited dxLayoutControl1: TdxLayoutControl
@@ -74,7 +74,7 @@ inherited fEditorContacto: TfEditorContacto
             end
           end
           inherited frViewTelefonos1: TfrViewTelefonos
-            Left = 479
+            Left = 312
             Width = 451
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 451
@@ -108,19 +108,10 @@ inherited fEditorContacto: TfEditorContacto
             end
           end
           inherited frViewInternet1: TfrViewInternet
-            Left = 479
+            Left = 312
             Width = 483
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 483
-              inherited SpeedButton1: TSpeedButton
-                Left = 419
-              end
-              inherited SpeedButton2: TSpeedButton
-                Left = 419
-              end
-              inherited SpeedButton3: TSpeedButton
-                Left = 419
-              end
               inherited eMailTrabajo: TcxDBHyperLinkEdit
                 Properties.Prefix = 'mailto:'
                 Width = 185
@@ -151,7 +142,7 @@ inherited fEditorContacto: TfEditorContacto
             end
           end
           inherited frViewContactosAsociados1: TfrViewContactosAsociados
-            Left = 479
+            Left = 312
             Width = 846
             Height = 145
             inherited dxLayoutControl1: TdxLayoutControl
@@ -175,7 +166,7 @@ inherited fEditorContacto: TfEditorContacto
       inline frViewDatosBancarios1: TfrViewDatosBancarios
         Left = 0
         Top = 0
-        Width = 953
+        Width = 636
         Height = 195
         Align = alTop
         Font.Charset = DEFAULT_CHARSET
@@ -187,18 +178,17 @@ inherited fEditorContacto: TfEditorContacto
         TabOrder = 0
         ReadOnly = False
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 953
+          Width = 636
           inherited memObservaciones: TcxDBMemo
-            Height = 107
-            Width = 197
+            Width = 909
           end
         end
       end
       inline frViewDatosFacturacion1: TfrViewDatosFacturacion
         Left = 0
         Top = 195
-        Width = 953
-        Height = 348
+        Width = 636
+        Height = 140
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -209,8 +199,8 @@ inherited fEditorContacto: TfEditorContacto
         TabOrder = 1
         ReadOnly = False
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 953
-          Height = 348
+          Width = 636
+          Height = 140
           inherited memObservaciones: TcxDBMemo
             Height = 127
             Width = 576
@@ -220,8 +210,8 @@ inherited fEditorContacto: TfEditorContacto
     end
   end
   inherited StatusBar: TStatusBar
-    Top = 647
-    Width = 961
+    Top = 439
+    Width = 644
   end
   inherited EditorActionList: TActionList
     Top = 144
diff --git a/Modulos/Contactos/Cliente/uEditorContactos.dfm b/Modulos/Contactos/Cliente/uEditorContactos.dfm
index 64e3864..84d3ac9 100644
--- a/Modulos/Contactos/Cliente/uEditorContactos.dfm
+++ b/Modulos/Contactos/Cliente/uEditorContactos.dfm
@@ -1,6 +1,4 @@
 inherited fEditorContactos: TfEditorContactos
-  Left = 405
-  Top = 188
   Caption = 'Libreta de contactos'
   OnClose = CustomEditorClose
   PixelsPerInch = 96
@@ -26,8 +24,8 @@ inherited fEditorContactos: TfEditorContactos
   inline frViewContactos1: TfrViewContactos [4]
     Left = 0
     Top = 76
-    Width = 711
-    Height = 322
+    Width = 630
+    Height = 277
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -38,8 +36,8 @@ inherited fEditorContactos: TfEditorContactos
     TabOrder = 4
     ReadOnly = False
     inherited cxGrid: TcxGrid
-      Width = 711
-      Height = 322
+      Width = 630
+      Height = 277
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
diff --git a/Modulos/Contactos/Cliente/uViewCategoriasContacto.dfm b/Modulos/Contactos/Cliente/uViewCategoriasContacto.dfm
index a45c771..a79f97f 100644
--- a/Modulos/Contactos/Cliente/uViewCategoriasContacto.dfm
+++ b/Modulos/Contactos/Cliente/uViewCategoriasContacto.dfm
@@ -1,17 +1,17 @@
 inherited frViewCategoriasContacto: TfrViewCategoriasContacto
-  Width = 759
+  Width = 632
   Height = 293
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 759
+    Width = 632
     Height = 293
     Align = alClient
     ParentBackground = True
     TabOrder = 0
     AutoContentSizes = [acsWidth, acsHeight]
     DesignSize = (
-      759
+      632
       293)
     object ToolBar2: TToolBar
       Left = 22
@@ -52,6 +52,8 @@ inherited frViewCategoriasContacto: TfrViewCategoriasContacto
       ParentFont = False
       Properties.ReadOnly = True
       Properties.ScrollBars = ssVertical
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.Font.Charset = DEFAULT_CHARSET
       Style.Font.Color = clWindowText
       Style.Font.Height = -11
diff --git a/Modulos/Contactos/Cliente/uViewContacto.dfm b/Modulos/Contactos/Cliente/uViewContacto.dfm
index a5cbf63..8c797b1 100644
--- a/Modulos/Contactos/Cliente/uViewContacto.dfm
+++ b/Modulos/Contactos/Cliente/uViewContacto.dfm
@@ -194,9 +194,6 @@ inherited frViewContacto: TfrViewContacto
         DesignSize = (
           846
           145)
-        inherited ToolBar2: TToolBar
-          Width = 271
-        end
         inherited DBLookupListBox1: TDBLookupListBox
           Height = 13
         end
diff --git a/Modulos/Contactos/Cliente/uViewContactos.dfm b/Modulos/Contactos/Cliente/uViewContactos.dfm
index 714da47..ebb3c1b 100644
--- a/Modulos/Contactos/Cliente/uViewContactos.dfm
+++ b/Modulos/Contactos/Cliente/uViewContactos.dfm
@@ -71,7 +71,7 @@ inherited frViewContactos: TfrViewContactos
       end
       object cxGridViewFAX: TcxGridDBColumn
         DataBinding.FieldName = 'FAX'
-        Visible = False
+        Width = 90
       end
       object cxGridViewCORREO1: TcxGridDBColumn
         DataBinding.FieldName = 'CORREO1'
@@ -315,7 +315,7 @@ inherited frViewContactos: TfrViewContactos
         Size = 30
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'N'#250'mero de fax'
+        DisplayLabel = 'Fax'
         Alignment = taLeftJustify
         DictionaryEntry = 'FAX'
         InPrimaryKey = False
diff --git a/Modulos/Contactos/Cliente/uViewDatosFacturacion.dfm b/Modulos/Contactos/Cliente/uViewDatosFacturacion.dfm
index 08756a3..def40ed 100644
--- a/Modulos/Contactos/Cliente/uViewDatosFacturacion.dfm
+++ b/Modulos/Contactos/Cliente/uViewDatosFacturacion.dfm
@@ -2,8 +2,6 @@ inherited frViewDatosFacturacion: TfrViewDatosFacturacion
   inherited dxLayoutControl1: TdxLayoutControl
     inherited memObservaciones: TcxDBMemo
       DataBinding.DataField = 'DATOSFACTURACION'
-      Height = 107
-      Width = 197
     end
     inherited dxLayoutControl1Group_Root: TdxLayoutGroup
       inherited dxLayoutControl1Group1: TdxLayoutGroup
diff --git a/Modulos/Contactos/Cliente/uViewDatosGenerales.dfm b/Modulos/Contactos/Cliente/uViewDatosGenerales.dfm
index 1198593..28728da 100644
--- a/Modulos/Contactos/Cliente/uViewDatosGenerales.dfm
+++ b/Modulos/Contactos/Cliente/uViewDatosGenerales.dfm
@@ -11,10 +11,12 @@ inherited frViewDatosGenerales: TfrViewDatosGenerales
     TabOrder = 0
     AutoContentSizes = [acsWidth, acsHeight]
     object edtNombre: TcxDBTextEdit
-      Left = 68
+      Left = 69
       Top = 28
       DataBinding.DataField = 'NOMBRE'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -27,10 +29,12 @@ inherited frViewDatosGenerales: TfrViewDatosGenerales
       Width = 474
     end
     object edtNIFCIF: TcxDBTextEdit
-      Left = 68
+      Left = 69
       Top = 55
       DataBinding.DataField = 'NIFCIF'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
@@ -43,10 +47,12 @@ inherited frViewDatosGenerales: TfrViewDatosGenerales
       Width = 474
     end
     object edtTrabajo: TcxDBTextEdit
-      Left = 68
+      Left = 69
       Top = 82
       DataBinding.DataField = 'TRABAJO'
       DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
       Style.LookAndFeel.NativeStyle = True
       StyleDisabled.LookAndFeel.Kind = lfStandard
diff --git a/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
index 3dfe3d5..c59f29e 100644
--- a/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
+++ b/Modulos/Contactos/Servidor/srvContactos_Impl.dfm
@@ -6,8 +6,8 @@ object srvContactos: TsrvContactos
   ConnectionName = 'IBX'
   ServiceSchema = schContactos
   ServiceAdapter = DABINAdapter
-  Left = 578
-  Top = 289
+  Left = 358
+  Top = 144
   Height = 368
   Width = 464
   object schContactos: TDASchema
diff --git a/Modulos/Documentos asociados/DocumentosAsociados.dcp b/Modulos/Documentos asociados/DocumentosAsociados.dcp
index bb060e3..777cdc1 100644
Binary files a/Modulos/Documentos asociados/DocumentosAsociados.dcp and b/Modulos/Documentos asociados/DocumentosAsociados.dcp differ
diff --git a/Modulos/Facturas de cliente/Cliente/FacturasCliente.dcp b/Modulos/Facturas de cliente/Cliente/FacturasCliente.dcp
index 520a2d2..01b740d 100644
Binary files a/Modulos/Facturas de cliente/Cliente/FacturasCliente.dcp and b/Modulos/Facturas de cliente/Cliente/FacturasCliente.dcp differ
diff --git a/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm b/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm
index 0827c01..2fe23b7 100644
--- a/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
+++ b/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm	
@@ -5,9 +5,8 @@ object srvFacturasCliente: TsrvFacturasCliente
   ConnectionName = 'IBX'
   ServiceSchema = schFacturasCliente
   ServiceAdapter = DABINAdapter
-  Left = 725
-  Top = 332
-  Height = 490
+  Left = 567
+  Height = 446
   Width = 347
   object schFacturasCliente: TDASchema
     ConnectionManager = dmServer.ConnectionManager
diff --git a/Modulos/Obras final/Cliente/ObrasFinal.dcp b/Modulos/Obras final/Cliente/ObrasFinal.dcp
index 2e1ffb5..4e0ddb8 100644
Binary files a/Modulos/Obras final/Cliente/ObrasFinal.dcp and b/Modulos/Obras final/Cliente/ObrasFinal.dcp differ
diff --git a/Modulos/Obras/Cliente/Obras.dcp b/Modulos/Obras/Cliente/Obras.dcp
index 399165d..3382565 100644
Binary files a/Modulos/Obras/Cliente/Obras.dcp and b/Modulos/Obras/Cliente/Obras.dcp differ
diff --git a/Modulos/Obras/Servidor/srvObras_Impl.dfm b/Modulos/Obras/Servidor/srvObras_Impl.dfm
index 9bfdd81..5db766a 100644
--- a/Modulos/Obras/Servidor/srvObras_Impl.dfm
+++ b/Modulos/Obras/Servidor/srvObras_Impl.dfm
@@ -5,8 +5,8 @@ object srvObras: TsrvObras
   ConnectionName = 'IBX'
   ServiceSchema = schObras
   ServiceAdapter = DABINAdapter
-  Left = 657
-  Top = 335
+  Left = 514
+  Top = 271
   Height = 300
   Width = 300
   object schObras: TDASchema
diff --git a/Modulos/Recibos/Cliente/Recibos.dcp b/Modulos/Recibos/Cliente/Recibos.dcp
index c6176e8..63b0b10 100644
Binary files a/Modulos/Recibos/Cliente/Recibos.dcp and b/Modulos/Recibos/Cliente/Recibos.dcp differ
diff --git a/Modulos/Recibos/Servidor/srvRecibosCliente_Impl.dfm b/Modulos/Recibos/Servidor/srvRecibosCliente_Impl.dfm
index 2939fa2..75ea0ca 100644
--- a/Modulos/Recibos/Servidor/srvRecibosCliente_Impl.dfm
+++ b/Modulos/Recibos/Servidor/srvRecibosCliente_Impl.dfm
@@ -5,8 +5,8 @@ object srvRecibosCliente: TsrvRecibosCliente
   ConnectionName = 'IBX'
   ServiceSchema = schRecibosCliente
   ServiceAdapter = DABINAdapter
-  Left = 563
-  Top = 286
+  Left = 441
+  Top = 217
   Height = 328
   Width = 207
   object DABINAdapter: TDABINAdapter
diff --git a/Output/Cliente/BaseD7.bpl b/Output/Cliente/BaseD7.bpl
index 0b239e5..825c6b0 100644
Binary files a/Output/Cliente/BaseD7.bpl and b/Output/Cliente/BaseD7.bpl differ
diff --git a/Output/Cliente/Contactos.bpl b/Output/Cliente/Contactos.bpl
index 2841c92..f128fad 100644
Binary files a/Output/Cliente/Contactos.bpl and b/Output/Cliente/Contactos.bpl differ
diff --git a/Output/Cliente/DocumentosAsociados.bpl b/Output/Cliente/DocumentosAsociados.bpl
index fde6714..0d91ba7 100644
Binary files a/Output/Cliente/DocumentosAsociados.bpl and b/Output/Cliente/DocumentosAsociados.bpl differ
diff --git a/Output/Cliente/FacturasCliente.bpl b/Output/Cliente/FacturasCliente.bpl
index f5aed19..b7d4efe 100644
Binary files a/Output/Cliente/FacturasCliente.bpl and b/Output/Cliente/FacturasCliente.bpl differ
diff --git a/Output/Cliente/Obras.bpl b/Output/Cliente/Obras.bpl
index 654b153..5b5470b 100644
Binary files a/Output/Cliente/Obras.bpl and b/Output/Cliente/Obras.bpl differ
diff --git a/Output/Cliente/ObrasFinal.bpl b/Output/Cliente/ObrasFinal.bpl
index 4b9ec96..a817ad0 100644
Binary files a/Output/Cliente/ObrasFinal.bpl and b/Output/Cliente/ObrasFinal.bpl differ
diff --git a/Output/Cliente/ProGestion.exe b/Output/Cliente/ProGestion.exe
index 0689cb1..29b8799 100644
Binary files a/Output/Cliente/ProGestion.exe and b/Output/Cliente/ProGestion.exe differ
diff --git a/Output/Cliente/Recibos.bpl b/Output/Cliente/Recibos.bpl
index f1e2d60..37b82a7 100644
Binary files a/Output/Cliente/Recibos.bpl and b/Output/Cliente/Recibos.bpl differ
diff --git a/Output/Servidor/ProGestion_Server.exe b/Output/Servidor/ProGestion_Server.exe
index 63bf9f3..73b963a 100644
Binary files a/Output/Servidor/ProGestion_Server.exe and b/Output/Servidor/ProGestion_Server.exe differ
diff --git a/Servidor/srvConfiguracion_Impl.dfm b/Servidor/srvConfiguracion_Impl.dfm
index a3b5c56..bc461be 100644
--- a/Servidor/srvConfiguracion_Impl.dfm
+++ b/Servidor/srvConfiguracion_Impl.dfm
@@ -5,8 +5,8 @@ object srvConfiguracion: TsrvConfiguracion
   ConnectionName = 'IBX'
   ServiceSchema = schConfiguracion
   ServiceAdapter = DABINAdapter
-  Left = 731
-  Top = 212
+  Left = 571
+  Top = 216
   Height = 300
   Width = 300
   object schConfiguracion: TDASchema
diff --git a/Servidor/srvLogin_Impl.dfm b/Servidor/srvLogin_Impl.dfm
index 3035647..6d1e095 100644
--- a/Servidor/srvLogin_Impl.dfm
+++ b/Servidor/srvLogin_Impl.dfm
@@ -1,7 +1,7 @@
 object srvLogin: TsrvLogin
   OldCreateOrder = True
-  Left = 568
-  Top = 275
+  Left = 445
+  Top = 271
   Height = 300
   Width = 300
   object DABINAdapter: TDABINAdapter
diff --git a/Servidor/uDataModuleServer.dfm b/Servidor/uDataModuleServer.dfm
index 19f29bf..3e5fa98 100644
--- a/Servidor/uDataModuleServer.dfm
+++ b/Servidor/uDataModuleServer.dfm
@@ -1,8 +1,8 @@
 object dmServer: TdmServer
   OldCreateOrder = False
   OnCreate = DataModuleCreate
-  Left = 777
-  Top = 344
+  Left = 607
+  Top = 150
   Height = 365
   Width = 302
   object HTTPServer: TROIndyHTTPServer
@@ -159,7 +159,7 @@ object dmServer: TdmServer
         Size = 30
         BlobType = dabtUnknown
         DisplayWidth = 0
-        DisplayLabel = 'N'#250'mero de fax'
+        DisplayLabel = 'Fax'
         Alignment = taLeftJustify
       end
       item