diff --git a/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm b/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm
index cf4f0d87..78fa7d96 100644
--- a/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm
+++ b/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.dfm
@@ -37,7 +37,6 @@ object fConfiguracionEditor: TfConfiguracionEditor
     OptionsView.NavigationPane.ShowHeader = False
     OptionsView.NavigationPane.ShowOverflowPanel = False
     OnLinkClick = dxNavBarLinkClick
-    ExplicitHeight = 466
     object GroupCategorias: TdxNavBarGroup
       Caption = 'Categor'#237'as'
       SelectedLinkIndex = -1
@@ -53,8 +52,6 @@ object fConfiguracionEditor: TfConfiguracionEditor
     Align = alBottom
     BevelOuter = bvNone
     TabOrder = 1
-    ExplicitTop = 482
-    ExplicitWidth = 733
     DesignSize = (
       788
       42)
@@ -68,7 +65,6 @@ object fConfiguracionEditor: TfConfiguracionEditor
       Caption = '&Cancelar'
       ModalResult = 2
       TabOrder = 0
-      ExplicitLeft = 650
     end
     object bAceptar: TButton
       Left = 624
@@ -79,7 +75,6 @@ object fConfiguracionEditor: TfConfiguracionEditor
       Caption = '&Aceptar'
       ModalResult = 1
       TabOrder = 1
-      ExplicitLeft = 569
     end
   end
   object PageControlMain: TPageControl
@@ -94,7 +89,5 @@ object fConfiguracionEditor: TfConfiguracionEditor
     Margins.Bottom = 8
     Align = alClient
     TabOrder = 2
-    ExplicitWidth = 559
-    ExplicitHeight = 468
   end
 end
diff --git a/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.pas b/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.pas
index 977a0268..dcff8f97 100644
--- a/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.pas
+++ b/Source/ApplicationBase/Configuracion/Views/uEditorConfiguracion.pas
@@ -38,6 +38,9 @@ implementation
 
 {$R *.dfm}
 
+uses
+  uDisplayUtils;
+
 { TfConfiguracionEditor }
 
 procedure TfConfiguracionEditor.AnadirVista(AVista: TfrViewConfiguracionBase;
@@ -94,6 +97,7 @@ end;
 
 procedure TfConfiguracionEditor.FormShow(Sender: TObject);
 begin
+  ScaleFormFont(Self);
   PageControlMain.ActivePageIndex := 0;
   dxNavBar.Groups[0].Links[0].Selected := True;
 end;
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm
index a35428a2..5a7936ac 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.dfm
@@ -15,6 +15,7 @@ object fEditorCambiarPassword: TfEditorCambiarPassword
   Position = poScreenCenter
   OnClose = FormClose
   OnCloseQuery = FormCloseQuery
+  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
   object Bevel4: TBevel
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas
index 0f5ec159..b4d087f5 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorCambiarPassword.pas
@@ -25,6 +25,7 @@ type
     procedure FormCloseQuery(Sender: TObject; var CanClose: Boolean);
     procedure actCancelarExecute(Sender: TObject);
     procedure actAceptarExecute(Sender: TObject);
+    procedure FormShow(Sender: TObject);
   public
     Usuario : IBizUsuario;
     Controller : IUsuariosController;
@@ -36,7 +37,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uDialogUtils;
+  uDialogUtils, uDisplayUtils;
 
 procedure TfEditorCambiarPassword.FormClose(Sender: TObject; var Action: TCloseAction);
 begin
@@ -98,4 +99,9 @@ begin
   end;
 end;
 
+procedure TfEditorCambiarPassword.FormShow(Sender: TObject);
+begin
+  ScaleFormFont(Self);
+end;
+
 end.
diff --git a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas
index b76e4ff7..9f401553 100644
--- a/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas
+++ b/Source/ApplicationBase/Usuarios/Views/uEditorLogin.pas
@@ -46,7 +46,7 @@ type
 implementation
 
 uses
-  uFactuGES_App, uDataModuleConexion;
+  uFactuGES_App, uDataModuleConexion, uDisplayUtils;
 
 {$R *.dfm}
 
@@ -112,6 +112,7 @@ end;
 
 procedure TfEditorLogin.FormShow(Sender: TObject);
 begin
+  ScaleFormFont(Self);
   Self.Caption := AppFactuGES.AppFullName;
   JvFormStorage1.RestoreFormPlacement;
 
diff --git a/Source/ApplicationBase/uFactuGES_App.pas b/Source/ApplicationBase/uFactuGES_App.pas
index e80a0ca3..38c946e4 100644
--- a/Source/ApplicationBase/uFactuGES_App.pas
+++ b/Source/ApplicationBase/uFactuGES_App.pas
@@ -550,7 +550,6 @@ begin
     JsDialog.ButtonBar.Buttons := [cbCancel];
     JsDialog.Width := 600;
 
-
     //Añadimos las diferentes empresas que existan
     AEmpresasController := TEmpresasController.Create;
     AEmpresas := AEmpresasController.BuscarTodos;
diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk
index 20483605..0dfc9ca3 100644
--- a/Source/Base/Base.dpk
+++ b/Source/Base/Base.dpk
@@ -105,7 +105,8 @@ contains
   uStringsUtils in 'Utiles\uStringsUtils.pas',
   uAppInfoUtils in 'Utiles\uAppInfoUtils.pas',
   uViewConfiguracionRegistryUtils in 'Utiles\ClassRegistry\uViewConfiguracionRegistryUtils.pas',
-  uEMailUtils in 'Utiles\uEMailUtils.pas';
+  uEMailUtils in 'Utiles\uEMailUtils.pas',
+  uDisplayUtils in 'Utiles\uDisplayUtils.pas';
 
 end.
  
\ No newline at end of file
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index e6af759e..048aabdd 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,6 +44,62 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -59,54 +115,6 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\Servidor\adortl.dcp" />
-    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
-    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Servidor\cxGridD11.dcp" />
-    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Servidor\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Servidor\dbrtl.dcp" />
-    <DCCReference Include="..\Servidor\dclIndyCore.dcp" />
-    <DCCReference Include="..\Servidor\designide.dcp" />
-    <DCCReference Include="..\Servidor\dsnap.dcp" />
-    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Servidor\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\Servidor\IndyCore.dcp" />
-    <DCCReference Include="..\Servidor\IndyProtocols.dcp" />
-    <DCCReference Include="..\Servidor\IndySystem.dcp" />
-    <DCCReference Include="..\Servidor\Jcl.dcp" />
-    <DCCReference Include="..\Servidor\JclVcl.dcp" />
-    <DCCReference Include="..\Servidor\JSDialog100.dcp" />
-    <DCCReference Include="..\Servidor\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvMMD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvNetD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Servidor\pckMD5.dcp" />
-    <DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Servidor\PluginSDK_D11R.dcp" />
-    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
-    <DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Servidor\rtl.dcp" />
-    <DCCReference Include="..\Servidor\TB2k_D10.dcp" />
-    <DCCReference Include="..\Servidor\tbx_d10.dcp" />
-    <DCCReference Include="..\Servidor\vcl.dcp" />
-    <DCCReference Include="..\Servidor\vclactnband.dcp" />
-    <DCCReference Include="..\Servidor\vcldb.dcp" />
-    <DCCReference Include="..\Servidor\vcljpg.dcp" />
-    <DCCReference Include="..\Servidor\VclSmp.dcp" />
-    <DCCReference Include="..\Servidor\vclx.dcp" />
-    <DCCReference Include="..\Servidor\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>
@@ -130,17 +138,59 @@
       <Form>dmBase</Form>
       <DesignClass>TDataModule</DesignClass>
     </DCCReference>
+    <DCCReference Include="Utiles\adortl.dcp" />
     <DCCReference Include="Utiles\ClassRegistry\uClassRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uEditorRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uInformeRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewConfiguracionRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewRegistryUtils.pas" />
+    <DCCReference Include="Utiles\cxDataD11.dcp" />
+    <DCCReference Include="Utiles\cxEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxExtEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxGridD11.dcp" />
+    <DCCReference Include="Utiles\cxLibraryD11.dcp" />
+    <DCCReference Include="Utiles\cxPageControlD11.dcp" />
+    <DCCReference Include="Utiles\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="Utiles\dbrtl.dcp" />
+    <DCCReference Include="Utiles\dclIndyCore.dcp" />
+    <DCCReference Include="Utiles\designide.dcp" />
+    <DCCReference Include="Utiles\dsnap.dcp" />
+    <DCCReference Include="Utiles\dxGDIPlusD11.dcp" />
+    <DCCReference Include="Utiles\dxPSCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxThemeD11.dcp" />
+    <DCCReference Include="Utiles\GUISDK_D11R.dcp" />
+    <DCCReference Include="Utiles\IndyCore.dcp" />
+    <DCCReference Include="Utiles\IndyProtocols.dcp" />
+    <DCCReference Include="Utiles\IndySystem.dcp" />
+    <DCCReference Include="Utiles\Jcl.dcp" />
+    <DCCReference Include="Utiles\JclVcl.dcp" />
+    <DCCReference Include="Utiles\JSDialog100.dcp" />
+    <DCCReference Include="Utiles\JvCmpD11R.dcp" />
+    <DCCReference Include="Utiles\JvCoreD11R.dcp" />
+    <DCCReference Include="Utiles\JvCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvDlgsD11R.dcp" />
+    <DCCReference Include="Utiles\JvMMD11R.dcp" />
+    <DCCReference Include="Utiles\JvNetD11R.dcp" />
+    <DCCReference Include="Utiles\JvPageCompsD11R.dcp" />
+    <DCCReference Include="Utiles\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvSystemD11R.dcp" />
+    <DCCReference Include="Utiles\pckMD5.dcp" />
+    <DCCReference Include="Utiles\pckUCDataConnector.dcp" />
+    <DCCReference Include="Utiles\pckUserControl_RT.dcp" />
+    <DCCReference Include="Utiles\PluginSDK_D11R.dcp" />
+    <DCCReference Include="Utiles\PngComponentsD10.dcp" />
+    <DCCReference Include="Utiles\PNG_D10.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Utiles\rtl.dcp" />
+    <DCCReference Include="Utiles\TB2k_D10.dcp" />
+    <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
     <DCCReference Include="Utiles\uDateUtils.pas" />
     <DCCReference Include="Utiles\uDBSelectionListUtils.pas" />
     <DCCReference Include="Utiles\uDialogUtils.pas" />
+    <DCCReference Include="Utiles\uDisplayUtils.pas" />
     <DCCReference Include="Utiles\uEMailUtils.pas" />
     <DCCReference Include="Utiles\uGridUtils.pas" />
     <DCCReference Include="Utiles\uInfoProjectUtils.pas" />
@@ -150,6 +200,13 @@
     <DCCReference Include="Utiles\uPasswordUtils.pas" />
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
     <DCCReference Include="Utiles\uStringsUtils.pas" />
+    <DCCReference Include="Utiles\vcl.dcp" />
+    <DCCReference Include="Utiles\vclactnband.dcp" />
+    <DCCReference Include="Utiles\vcldb.dcp" />
+    <DCCReference Include="Utiles\vcljpg.dcp" />
+    <DCCReference Include="Utiles\VclSmp.dcp" />
+    <DCCReference Include="Utiles\vclx.dcp" />
+    <DCCReference Include="Utiles\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Base/Conexion/uConfigurarConexion.dfm b/Source/Base/Conexion/uConfigurarConexion.dfm
index b9e3cb0c..fee59f24 100644
--- a/Source/Base/Conexion/uConfigurarConexion.dfm
+++ b/Source/Base/Conexion/uConfigurarConexion.dfm
@@ -6,15 +6,12 @@ object fConfigurarConexion: TfConfigurarConexion
   ClientHeight = 149
   ClientWidth = 392
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'MS Sans Serif'
-  Font.Style = []
+  ParentFont = True
   OldCreateOrder = False
   Position = poScreenCenter
   Scaled = False
   OnCreate = FormCreate
+  OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
   object bProbar: TButton
@@ -39,9 +36,8 @@ object fConfigurarConexion: TfConfigurarConexion
     object Label1: TLabel
       Left = 18
       Top = 28
-      Width = 97
+      Width = 100
       Height = 13
-      Margins.Bottom = 0
       Caption = 'Nombre del servidor:'
     end
     object Label2: TLabel
@@ -49,7 +45,6 @@ object fConfigurarConexion: TfConfigurarConexion
       Top = 60
       Width = 93
       Height = 13
-      Margins.Bottom = 0
       Caption = 'Puerto de escucha:'
     end
     object edtServer: TEdit
@@ -99,6 +94,7 @@ object fConfigurarConexion: TfConfigurarConexion
     Top = 112
   end
   object ROBinMessage: TROBinMessage
+    Envelopes = <>
     Left = 152
     Top = 112
   end
diff --git a/Source/Base/Conexion/uConfigurarConexion.pas b/Source/Base/Conexion/uConfigurarConexion.pas
index d93c9a7e..9750d88d 100644
--- a/Source/Base/Conexion/uConfigurarConexion.pas
+++ b/Source/Base/Conexion/uConfigurarConexion.pas
@@ -22,6 +22,7 @@ type
     CoService: TRORemoteService;
     procedure bProbarClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
+    procedure FormShow(Sender: TObject);
   private
     function GetTargetURL: String;
     procedure SetTargetURL(const Value: String);
@@ -36,7 +37,7 @@ var
 implementation
 
 uses
-  StrUtils, JclStrings, uDataModuleConexion, uDialogUtils;
+  StrUtils, JclStrings, uDataModuleConexion, uDialogUtils, uDisplayUtils;
 
 {$R *.dfm}
 
@@ -73,4 +74,9 @@ begin
   HTTPChannel.OnFailure := dmConexion.ROChannelFailure;
 end;
 
+procedure TfConfigurarConexion.FormShow(Sender: TObject);
+begin
+  ScaleFormFont(Self);
+end;
+
 end.
diff --git a/Source/Base/Utiles/uDisplayUtils.pas b/Source/Base/Utiles/uDisplayUtils.pas
new file mode 100644
index 00000000..3a447572
--- /dev/null
+++ b/Source/Base/Utiles/uDisplayUtils.pas
@@ -0,0 +1,62 @@
+unit uDisplayUtils;
+
+interface
+
+
+uses
+  Windows, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  uGUIBase, uCustomEditor;
+
+procedure ScaleFormFont(AForm : TForm);
+
+implementation
+
+uses
+  TypInfo;
+
+procedure SetFontProperties(Control: TControl; Name: TFontName; Size: Integer; Styles: TFontStyles);
+// Set font properties
+var
+  Index: Integer;
+  Font: TFont;
+  AnObject: TObject;
+  ChildControl: TControl;
+begin
+  // Set font properties
+  try
+    AnObject := GetObjectProp(Control, 'Font', nil);
+    if AnObject is TFont then
+    begin
+      // Set properties
+      Font := TFont(AnObject);
+      Font.Name  := Name;
+      Font.Size  := Size;
+      Font.Style := Styles;
+    end;
+  except
+    // ignorar las excepciones EPropertyError por no encontrar la propiedad 
+
+  end;
+
+  // Set child font properties
+  if Control is TWinControl then
+  begin
+    // Set
+    for Index := 0 to TWinControl(Control).ControlCount - 1 do
+    begin
+      // Child control
+      ChildControl := TWinControl(Control).Controls[Index];
+
+      // Set font properties
+      SetFontProperties(ChildControl, Name, Size, Styles);
+    end;
+  end;
+end;
+
+procedure ScaleFormFont(AForm : TForm);
+begin
+  AForm.ScaleBy(Screen.PixelsPerInch, 96);
+  SetFontProperties(AForm, Screen.IconFont.Name, Screen.IconFont.Size, Screen.IconFont.Style);
+end;
+
+end.
diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index f0f8ca76..6818d12d 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -54,6 +54,25 @@
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
diff --git a/Source/Cliente/uBootStrap.pas b/Source/Cliente/uBootStrap.pas
index 24517f6e..93333a6d 100644
--- a/Source/Cliente/uBootStrap.pas
+++ b/Source/Cliente/uBootStrap.pas
@@ -96,6 +96,7 @@ begin
 
   NavPaneController := TNavPaneController.Create;
   MainMenuController := TMainMenuController.Create;
+
 end;
 
 procedure Run;
diff --git a/Source/Cliente/uPantallaPrincipal.pas b/Source/Cliente/uPantallaPrincipal.pas
index 6e8146f8..1fa72541 100644
--- a/Source/Cliente/uPantallaPrincipal.pas
+++ b/Source/Cliente/uPantallaPrincipal.pas
@@ -156,7 +156,7 @@ uses
   uSplash, uAcercaDe, UxTheme, Themes, uMenuUtils, uBizEmpresas,
   uFactuGES_App, uDMBase, uDataModuleConexion,
   uModuleController, uMainMenuController, uNavPaneController,
-  uDialogUtils, cxControls;
+  uDialogUtils, cxControls, uDisplayUtils;
 
 {$R *.dfm}
 
@@ -282,8 +282,11 @@ begin
 end;
 
 procedure TfPantallaPrincipal.OnThemeChange(Sender: TObject);
+var
+  I: Integer;
 begin
   LockWindowUpdate(Handle);
+
   try
     Color := dmBase.StyleManager.Colors.DividerColorTo;
     pnlBorde.BoundColor := dmBase.StyleManager.Colors.FrameColor;
@@ -327,6 +330,8 @@ var
 begin
   ShowHourglassCursor;
   try
+    ScaleFormFont(Self);
+    
     CargarIdioma;
     
     for i := 0 to AppFactuGES.ModuleManager.ModulesCount - 1 do
@@ -459,6 +464,8 @@ begin
       BorderIcons := [];
       BorderStyle := bsNone;
       Parent := WorkPanel;
+      ScaleFormFont(FContenido);
+
       FContenido.Show;
       Align := alClient;
       FContenido.SetFocus;
diff --git a/Source/GUIBase/uDialogBase.pas b/Source/GUIBase/uDialogBase.pas
index 9018958f..bd627dbb 100644
--- a/Source/GUIBase/uDialogBase.pas
+++ b/Source/GUIBase/uDialogBase.pas
@@ -37,10 +37,11 @@ implementation
 {$R *.dfm}
 
 uses
-  uDMBase;
+  uDMBase, uDisplayUtils;
 
 procedure TfDialogBase.FormShow(Sender: TObject);
 begin
+  ScaleFormFont(Self);
   lblTitle.Font.Color := dmBase.StyleManager.Colors.HeaderColorTo;
 end;
 
diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm
index 2b5ccae7..c6775f46 100644
--- a/Source/GUIBase/uEditorBase.dfm
+++ b/Source/GUIBase/uEditorBase.dfm
@@ -5,11 +5,7 @@ object fEditorBase: TfEditorBase
   ClientHeight = 509
   ClientWidth = 946
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'Tahoma'
-  Font.Style = []
+  ParentFont = True
   KeyPreview = True
   OldCreateOrder = False
   Position = poDefault
@@ -23,7 +19,7 @@ object fEditorBase: TfEditorBase
   TextHeight = 13
   object JvNavPanelHeader: TJvNavPanelHeader
     Left = 0
-    Top = 49
+    Top = 58
     Width = 946
     Align = alTop
     Caption = 'Editor'
@@ -72,10 +68,10 @@ object fEditorBase: TfEditorBase
     Left = 0
     Top = 0
     Width = 946
-    Height = 49
+    Height = 58
     object tbxMain: TTBXToolbar
       Left = 0
-      Top = 23
+      Top = 29
       Caption = 'tbxMain'
       ChevronHint = 'M'#225's botones|'
       DockMode = dmCannotFloatOrChangeDocks
diff --git a/Source/GUIBase/uEditorBase.pas b/Source/GUIBase/uEditorBase.pas
index 090edad9..9909189a 100644
--- a/Source/GUIBase/uEditorBase.pas
+++ b/Source/GUIBase/uEditorBase.pas
@@ -168,7 +168,7 @@ implementation
 {$R *.dfm}
 
 uses
-  Menus, uDMBase, cxControls, cxEdit, uDialogUtils, uStringsUtils;
+  Menus, uDMBase, cxControls, cxEdit, uDialogUtils, uStringsUtils, uDisplayUtils;
 
 {Método que coge el componente editor que tenga el foco y le fuerza a hacer post para que la tabla se entere
 }
@@ -397,6 +397,7 @@ end;
 
 procedure TfEditorBase.FormShow(Sender: TObject);
 begin
+  ScaleFormFont(Self);
   ActualizarEstadoEditor;
   if Assigned(Parent) then
   begin
diff --git a/Source/GUIBase/uEditorBasico.dfm b/Source/GUIBase/uEditorBasico.dfm
index ef85a644..b44374eb 100644
--- a/Source/GUIBase/uEditorBasico.dfm
+++ b/Source/GUIBase/uEditorBasico.dfm
@@ -5,12 +5,9 @@ object fEditorBasico: TfEditorBasico
   ClientHeight = 236
   ClientWidth = 383
   Color = clBtnFace
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'Tahoma'
-  Font.Style = []
+  ParentFont = True
   OldCreateOrder = False
+  OnShow = CustomEditorShow
   InstanceID = 0
   ReadOnly = False
   PixelsPerInch = 96
diff --git a/Source/GUIBase/uEditorBasico.pas b/Source/GUIBase/uEditorBasico.pas
index 7a8e97d1..0940696e 100644
--- a/Source/GUIBase/uEditorBasico.pas
+++ b/Source/GUIBase/uEditorBasico.pas
@@ -13,11 +13,20 @@ type
   end;
 
   TfEditorBasico = class(TCustomEditor, IEditorBasico)
+    procedure CustomEditorShow(Sender: TObject);
   end;
 
 implementation
 {$R *.dfm}
 
+uses
+  uDisplayUtils;
+
+procedure TfEditorBasico.CustomEditorShow(Sender: TObject);
+begin
+  ScaleFormFont(Self);
+end;
+
 initialization
   RegisterClass(TfEditorBasico);
 
diff --git a/Source/GUIBase/uEditorDBItem.dfm b/Source/GUIBase/uEditorDBItem.dfm
index 15294aa7..b86815a9 100644
--- a/Source/GUIBase/uEditorDBItem.dfm
+++ b/Source/GUIBase/uEditorDBItem.dfm
@@ -21,7 +21,7 @@ inherited fEditorDBItem: TfEditorDBItem
     Width = 650
     ExplicitWidth = 650
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 605
+      ExplicitWidth = 650
       inherited TBXItem26: TTBXItem
         Visible = False
       end
@@ -77,9 +77,9 @@ inherited fEditorDBItem: TfEditorDBItem
   object pgPaginas: TPageControl [3]
     AlignWithMargins = True
     Left = 3
-    Top = 109
+    Top = 118
     Width = 644
-    Height = 328
+    Height = 319
     ActivePage = pagGeneral
     Align = alClient
     TabOrder = 2
@@ -93,7 +93,7 @@ inherited fEditorDBItem: TfEditorDBItem
   end
   object PnlComentario: TPanel [4]
     Left = 0
-    Top = 76
+    Top = 85
     Width = 650
     Height = 30
     Align = alTop
diff --git a/Source/GUIBase/uEditorItem.dfm b/Source/GUIBase/uEditorItem.dfm
index 406f3d38..e9e40725 100644
--- a/Source/GUIBase/uEditorItem.dfm
+++ b/Source/GUIBase/uEditorItem.dfm
@@ -20,9 +20,9 @@ inherited fEditorItem: TfEditorItem
   object pgPaginas: TPageControl [1]
     AlignWithMargins = True
     Left = 3
-    Top = 79
+    Top = 88
     Width = 672
-    Height = 400
+    Height = 391
     ActivePage = pagGeneral
     Align = alClient
     TabOrder = 1
@@ -34,7 +34,7 @@ inherited fEditorItem: TfEditorItem
     Width = 678
     ExplicitWidth = 678
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 581
+      ExplicitWidth = 678
       inherited TBXItem5: TTBXItem
         Visible = False
       end
diff --git a/Source/GUIBase/uViewBase.dfm b/Source/GUIBase/uViewBase.dfm
index 17e1d504..70dad84e 100644
--- a/Source/GUIBase/uViewBase.dfm
+++ b/Source/GUIBase/uViewBase.dfm
@@ -3,12 +3,6 @@ object frViewBase: TfrViewBase
   Top = 0
   Width = 445
   Height = 291
-  Font.Charset = DEFAULT_CHARSET
-  Font.Color = clWindowText
-  Font.Height = -11
-  Font.Name = 'Tahoma'
-  Font.Style = []
-  ParentFont = False
   TabOrder = 0
   ReadOnly = False
 end
diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm
index 0fcddf78..3544c8cc 100644
--- a/Source/GUIBase/uViewGrid.dfm
+++ b/Source/GUIBase/uViewGrid.dfm
@@ -1,6 +1,7 @@
 inherited frViewGrid: TfrViewGrid
   Width = 554
   Height = 594
+  ParentFont = True
   ExplicitWidth = 554
   ExplicitHeight = 594
   object cxGrid: TcxGrid [0]
@@ -9,12 +10,6 @@ inherited frViewGrid: TfrViewGrid
     Width = 554
     Height = 466
     Align = alClient
-    Font.Charset = DEFAULT_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -11
-    Font.Name = 'Tahoma'
-    Font.Style = []
-    ParentFont = False
     TabOrder = 0
     LookAndFeel.Kind = lfOffice11
     LookAndFeel.NativeStyle = True
@@ -87,27 +82,15 @@ inherited frViewGrid: TfrViewGrid
         Width = 554
         ExplicitWidth = 554
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 457
           Width = 457
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 240
           Width = 240
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 344
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 344
           ExplicitWidth = 200
           Width = 200
@@ -135,7 +118,6 @@ inherited frViewGrid: TfrViewGrid
     SupportedDocks = [dkStandardDock, dkMultiDock]
     TabOrder = 2
     Visible = False
-    ExplicitWidth = 128
     object TBXAlignmentPanel1: TTBXAlignmentPanel
       Left = 0
       Top = 0
@@ -183,7 +165,7 @@ inherited frViewGrid: TfrViewGrid
       PrinterPage.ScaleMode = smFit
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 40113.806179872680000000
+      ReportDocument.CreationDate = 42257.757428541660000000
       StyleManager = dmBase.dxPrintStyleManager1
       OptionsCards.Shadow.Depth = 0
       OptionsExpanding.ExpandGroupRows = True
diff --git a/Source/GUIBase/uViewGrid2Niveles.dfm b/Source/GUIBase/uViewGrid2Niveles.dfm
index be16c2f6..3a73c589 100644
--- a/Source/GUIBase/uViewGrid2Niveles.dfm
+++ b/Source/GUIBase/uViewGrid2Niveles.dfm
@@ -1,6 +1,7 @@
 inherited frViewGrid2Niveles: TfrViewGrid2Niveles
   Width = 519
   Height = 367
+  ParentFont = True
   ExplicitWidth = 519
   ExplicitHeight = 367
   object cxGrid: TcxGrid [0]
@@ -9,12 +10,6 @@ inherited frViewGrid2Niveles: TfrViewGrid2Niveles
     Width = 519
     Height = 367
     Align = alClient
-    Font.Charset = DEFAULT_CHARSET
-    Font.Color = clWindowText
-    Font.Height = -11
-    Font.Name = 'Tahoma'
-    Font.Style = []
-    ParentFont = False
     TabOrder = 0
     LookAndFeel.Kind = lfOffice11
     LookAndFeel.NativeStyle = True
diff --git a/Source/GUIBase/uViewGridBase.dfm b/Source/GUIBase/uViewGridBase.dfm
index 56958797..d89a2a99 100644
--- a/Source/GUIBase/uViewGridBase.dfm
+++ b/Source/GUIBase/uViewGridBase.dfm
@@ -1,6 +1,7 @@
 inherited frViewGridBase: TfrViewGridBase
   Width = 441
   Height = 268
+  ParentFont = True
   ExplicitWidth = 441
   ExplicitHeight = 268
   object dsDataSource: TDADataSource
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
index 27da9d20..21a9246e 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
@@ -1,5 +1,6 @@
 inherited frViewArticulos: TfrViewArticulos
   inherited cxGrid: TcxGrid
+    ParentFont = True
     inherited cxGridView: TcxGridDBTableView
       OnMouseMove = cxGridViewMouseMove
       DataController.KeyFieldNames = 'ID'
@@ -156,32 +157,9 @@ inherited frViewArticulos: TfrViewArticulos
       end
     end
   end
-  inherited frViewFiltroBase1: TfrViewFiltroBase
-    inherited TBXDockablePanel1: TTBXDockablePanel
-      inherited dxLayoutControl1: TdxLayoutControl
-        inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-        inherited edtFechaFinFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-      end
-    end
-  end
   inherited pnlAgrupaciones: TTBXDockablePanel
     Visible = True
+    ExplicitWidth = 554
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
       inherited TBXToolbar1: TTBXToolbar
         object TBXSeparatorItem1: TTBXSeparatorItem
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 73806636..9667d09e 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 2,6,6,0
-PRODUCTVERSION 2,6,6,0
+FILEVERSION 2,6,4,0
+PRODUCTVERSION 2,6,4,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "2.6.6.0\0"
+              VALUE "FileVersion", "2.6.4.0\0"
               VALUE "ProductName", "FactuGES (Servidor)\0"
-              VALUE "ProductVersion", "2.6.6.0\0"
-              VALUE "CompileDate", "miércoles, 09 de septiembre de 2015 11:32\0"
+              VALUE "ProductVersion", "2.6.4.0\0"
+              VALUE "CompileDate", "jueves, 10 de septiembre de 2015 17:53\0"
          END
     END
     BLOCK "VarFileInfo"
diff --git a/Source/Servidor/FactuGES_Server.res b/Source/Servidor/FactuGES_Server.res
index b82d171e..bc872d4d 100644
Binary files a/Source/Servidor/FactuGES_Server.res and b/Source/Servidor/FactuGES_Server.res differ