diff --git a/Client/CentrED.lpi b/Client/CentrED.lpi
index 170d52d..a4cc2a6 100644
--- a/Client/CentrED.lpi
+++ b/Client/CentrED.lpi
@@ -19,7 +19,7 @@
       <MinorVersionNr Value="6"/>
       <RevisionNr Value="4"/>
       <BuildNr Value="245"/>
-      <StringTable CompanyName="AKS DataBasis" FileDescription="UO CentrED" InternalName="CentrED" LegalCopyright="(c) 2013 Andreas Schneider" OriginalFilename="CentrED.exe" ProductName="CentrED" ProductVersion="0.6.4"/>
+      <StringTable CompanyName="AKS DataBasis" FileDescription="UO CentrED" InternalName="CentrED" LegalCopyright="(c) 2015 Andreas Schneider" OriginalFilename="CentrED.exe" ProductName="CentrED" ProductVersion="0.6.4"/>
     </VersionInfo>
     <BuildModes Count="7">
       <Item1 Name="default" Default="True"/>
@@ -66,11 +66,9 @@
           </Linking>
           <Other>
             <CompilerMessages>
-              <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
-              <UseMsgFile Value="True"/>
+              <IgnoredMessages idx5028="True" idx5024="True" idx4081="True" idx4080="True" idx4079="True"/>
             </CompilerMessages>
             <CustomOptions Value="-dNoLogging"/>
-            <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
       </Item2>
@@ -117,11 +115,9 @@
           </Linking>
           <Other>
             <CompilerMessages>
-              <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
-              <UseMsgFile Value="True"/>
+              <IgnoredMessages idx5028="True" idx5024="True" idx4081="True" idx4080="True" idx4079="True"/>
             </CompilerMessages>
             <CustomOptions Value="-dNoLogging"/>
-            <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
       </Item3>
@@ -168,11 +164,9 @@
           </Linking>
           <Other>
             <CompilerMessages>
-              <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
-              <UseMsgFile Value="True"/>
+              <IgnoredMessages idx5028="True" idx5024="True" idx4081="True" idx4080="True" idx4079="True"/>
             </CompilerMessages>
             <CustomOptions Value="-dNoLogging"/>
-            <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
       </Item4>
@@ -204,11 +198,8 @@
           </CodeGeneration>
           <Other>
             <CompilerMessages>
-              <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
-              <UseMsgFile Value="True"/>
+              <IgnoredMessages idx5028="True" idx5024="True" idx4081="True" idx4080="True" idx4079="True"/>
             </CompilerMessages>
-            <CustomOptions Value="-dNoLogging"/>
-            <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
       </Item5>
@@ -240,11 +231,9 @@
           </CodeGeneration>
           <Other>
             <CompilerMessages>
-              <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
-              <UseMsgFile Value="True"/>
+              <IgnoredMessages idx5028="True" idx5024="True" idx4081="True" idx4080="True" idx4079="True"/>
             </CompilerMessages>
             <CustomOptions Value="-dNoLogging"/>
-            <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
       </Item6>
@@ -276,11 +265,9 @@
           </CodeGeneration>
           <Other>
             <CompilerMessages>
-              <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
-              <UseMsgFile Value="True"/>
+              <IgnoredMessages idx5028="True" idx5024="True" idx4081="True" idx4080="True" idx4079="True"/>
             </CompilerMessages>
             <CustomOptions Value="-dNoLogging"/>
-            <CompilerPath Value="$(CompPath)"/>
           </Other>
         </CompilerOptions>
       </Item7>
@@ -333,7 +320,6 @@
       <Unit0>
         <Filename Value="CentrED.lpr"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="CentrED"/>
       </Unit0>
       <Unit1>
         <Filename Value="UfrmMain.pas"/>
@@ -357,14 +343,12 @@
         <ComponentName Value="frmLogin"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmLogin"/>
       </Unit3>
       <Unit4>
         <Filename Value="UfrmInitialize.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmInitialize"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmInitialize"/>
       </Unit4>
       <Unit5>
         <Filename Value="UfrmAccountControl.pas"/>
@@ -372,111 +356,94 @@
         <ComponentName Value="frmAccountControl"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmAccountControl"/>
       </Unit5>
       <Unit6>
         <Filename Value="UfrmEditAccount.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmEditAccount"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmEditAccount"/>
       </Unit6>
       <Unit7>
         <Filename Value="Tools/UfrmDrawSettings.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmDrawSettings"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmDrawSettings"/>
       </Unit7>
       <Unit8>
         <Filename Value="Tools/UfrmBoundaries.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmBoundaries"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmBoundaries"/>
       </Unit8>
       <Unit9>
         <Filename Value="Tools/UfrmElevateSettings.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmElevateSettings"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmElevateSettings"/>
       </Unit9>
       <Unit10>
         <Filename Value="UOverlayUI.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UOverlayUI"/>
       </Unit10>
       <Unit11>
         <Filename Value="UResourceManager.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UResourceManager"/>
       </Unit11>
       <Unit12>
         <Filename Value="Tools/UfrmConfirmation.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmConfirmation"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmConfirmation"/>
       </Unit12>
       <Unit13>
         <Filename Value="Tools/UfrmMoveSettings.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmMoveSettings"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmMoveSettings"/>
       </Unit13>
       <Unit14>
         <Filename Value="UfrmAbout.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmAbout"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmAbout"/>
       </Unit14>
       <Unit15>
         <Filename Value="Tools/UfrmHueSettings.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmHueSettings"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmHueSettings"/>
       </Unit15>
       <Unit16>
         <Filename Value="UfrmRadar.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmRadarMap"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmRadar"/>
       </Unit16>
       <Unit17>
         <Filename Value="UfrmLargeScaleCommand.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmLargeScaleCommand"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmLargeScaleCommand"/>
       </Unit17>
       <Unit18>
         <Filename Value="Tools/UfrmVirtualLayer.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmVirtualLayer"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmVirtualLayer"/>
       </Unit18>
       <Unit19>
         <Filename Value="Tools/UfrmFilter.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmFilter"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmFilter"/>
       </Unit19>
       <Unit20>
         <Filename Value="UGUIPlatformUtils.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UGUIPlatformUtils"/>
       </Unit20>
       <Unit21>
         <Filename Value="UPlatformTypes.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UPlatformTypes"/>
       </Unit21>
       <Unit22>
         <Filename Value="UfrmRegionControl.pas"/>
@@ -484,7 +451,6 @@
         <ComponentName Value="frmRegionControl"/>
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmRegionControl"/>
       </Unit22>
       <Unit23>
         <Filename Value="UPacketHandlers.pas"/>
@@ -499,84 +465,68 @@
       <Unit25>
         <Filename Value="ULandscape.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ULandscape"/>
       </Unit25>
       <Unit26>
         <Filename Value="UGameResources.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UGameResources"/>
       </Unit26>
       <Unit27>
         <Filename Value="UAdminHandling.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UAdminHandling"/>
       </Unit27>
       <Unit28>
         <Filename Value="Tools/UfrmToolWindow.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmToolWindow"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmToolWindow"/>
       </Unit28>
       <Unit29>
         <Filename Value="../Logging.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="Logging"/>
       </Unit29>
       <Unit30>
         <Filename Value="../UOLib/UStatics.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UStatics"/>
       </Unit30>
       <Unit31>
         <Filename Value="../UOLib/UWorldItem.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UWorldItem"/>
       </Unit31>
       <Unit32>
         <Filename Value="../UOLib/UMap.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UMap"/>
       </Unit32>
       <Unit33>
         <Filename Value="../UOLib/UTiledata.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UTiledata"/>
       </Unit33>
       <Unit34>
         <Filename Value="UGLFont.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UGLFont"/>
       </Unit34>
       <Unit35>
         <Filename Value="../UOLib/UAnimData.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UAnimData"/>
       </Unit35>
       <Unit36>
         <Filename Value="../MulProvider/UTileDataProvider.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UTileDataProvider"/>
       </Unit36>
       <Unit37>
         <Filename Value="../MulProvider/UAnimDataProvider.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UAnimDataProvider"/>
       </Unit37>
       <Unit38>
         <Filename Value="../MulProvider/UMulManager.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UMulManager"/>
       </Unit38>
       <Unit39>
         <Filename Value="../MulProvider/UArtProvider.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UArtProvider"/>
       </Unit39>
       <Unit40>
         <Filename Value="../MulProvider/UTexmapProvider.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UTexmapProvider"/>
       </Unit40>
       <Unit41>
         <Filename Value="../version.inc"/>
@@ -585,34 +535,28 @@
       <Unit42>
         <Filename Value="ULightManager.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ULightManager"/>
       </Unit42>
       <Unit43>
         <Filename Value="../UOLib/ULight.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ULight"/>
       </Unit43>
       <Unit44>
         <Filename Value="../MulProvider/ULightProvider.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="ULightProvider"/>
       </Unit44>
       <Unit45>
         <Filename Value="Tools/UfrmLightlevel.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="frmLightlevel"/>
         <ResourceBaseClass Value="Form"/>
-        <UnitName Value="UfrmLightlevel"/>
       </Unit45>
       <Unit46>
         <Filename Value="../heContnrs.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="heContnrs"/>
       </Unit46>
       <Unit47>
         <Filename Value="../UContnrExt.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="UContnrExt"/>
       </Unit47>
       <Unit48>
         <Filename Value="UfrmChangePassword.pas"/>
@@ -654,10 +598,8 @@
     </Linking>
     <Other>
       <CompilerMessages>
-        <IgnoredMessages idx4079="True" idx4080="True" idx4081="True" idx5024="True" idx5028="True"/>
-        <UseMsgFile Value="True"/>
+        <IgnoredMessages idx5028="True" idx5024="True" idx4081="True" idx4080="True" idx4079="True"/>
       </CompilerMessages>
-      <CompilerPath Value="$(CompPath)"/>
     </Other>
   </CompilerOptions>
 </CONFIG>
diff --git a/Client/CentrED.lpr b/Client/CentrED.lpr
index 1bb1597..9733d44 100644
--- a/Client/CentrED.lpr
+++ b/Client/CentrED.lpr
@@ -28,7 +28,7 @@ program CentrED;
 {$mode objfpc}{$H+}
 
 uses
-  {$IFNDEF NoLogging}heaptrc,{$ENDIF}
+  {$IFNDEF NoLogging}heaptrc, Logging, filechannel,{$ENDIF}
   {$IFDEF UNIX}{$IFDEF UseCThreads}
   cthreads,
   {$ENDIF}{$ENDIF}
@@ -46,6 +46,7 @@ end;
 begin
   {$IFNDEF NoLogging}
   SetHeapTraceOutput('CentrED.trc');
+  Logger.Channels.Add(TFileChannel.Create('CentrED.log'));
   {$ENDIF}
 
   OnGetApplicationName := @GetApplicationName;
diff --git a/Client/UfrmMain.lfm b/Client/UfrmMain.lfm
index 98ba7aa..7d055d4 100644
--- a/Client/UfrmMain.lfm
+++ b/Client/UfrmMain.lfm
@@ -18,7 +18,7 @@ object frmMain: TfrmMain
   Position = poScreenCenter
   SessionProperties = 'acFlat.Checked;acNoDraw.Checked;Height;Left;mnuFlatShowHeight.Checked;mnuSecurityQuestion.Checked;mnuShowAnimations.Checked;spTileList.Top;tbStatics.Down;tbTerrain.Down;Top;Width;WindowState;mnuWhiteBackground.Checked'
   ShowInTaskBar = stAlways
-  LCLVersion = '1.3'
+  LCLVersion = '1.5'
   WindowState = wsMaximized
   object pnlBottom: TPanel
     Left = 0
@@ -81,7 +81,7 @@ object frmMain: TfrmMain
     end
     object edX: TSpinEdit
       Left = 24
-      Height = 25
+      Height = 21
       Top = 3
       Width = 55
       MaxValue = 100000
@@ -89,7 +89,7 @@ object frmMain: TfrmMain
     end
     object edY: TSpinEdit
       Left = 104
-      Height = 25
+      Height = 21
       Top = 3
       Width = 52
       MaxValue = 100000
@@ -117,13 +117,13 @@ object frmMain: TfrmMain
     TabOrder = 1
     object tsTiles: TTabSheet
       Caption = 'Tiles'
-      ClientHeight = 472
-      ClientWidth = 218
+      ClientHeight = 476
+      ClientWidth = 220
       object lblFilter: TLabel
         AnchorSideLeft.Control = cbTerrain
         AnchorSideLeft.Side = asrBottom
         AnchorSideTop.Control = cbTerrain
-        Left = 89
+        Left = 85
         Height = 13
         Top = 8
         Width = 31
@@ -140,10 +140,10 @@ object frmMain: TfrmMain
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = spTileList
         Left = 4
-        Height = 224
+        Height = 228
         Hint = '-'
         Top = 60
-        Width = 210
+        Width = 212
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Left = 4
         BorderSpacing.Top = 4
@@ -200,11 +200,11 @@ object frmMain: TfrmMain
         AnchorSideBottom.Side = asrBottom
         Left = 0
         Height = 183
-        Top = 289
-        Width = 218
+        Top = 293
+        Width = 220
         Anchors = [akTop, akLeft, akRight, akBottom]
         Caption = 'Random pool'
-        ClientHeight = 169
+        ClientHeight = 168
         ClientWidth = 216
         TabOrder = 1
         object btnAddRandom: TSpeedButton
@@ -362,7 +362,7 @@ object frmMain: TfrmMain
           Left = 164
           Height = 22
           Hint = 'Save Preset'
-          Top = 138
+          Top = 139
           Width = 22
           Anchors = [akTop, akRight]
           BorderSpacing.Right = 4
@@ -414,7 +414,7 @@ object frmMain: TfrmMain
           Left = 190
           Height = 22
           Hint = 'Delete Preset'
-          Top = 138
+          Top = 139
           Width = 22
           Anchors = [akTop, akRight]
           BorderSpacing.Right = 4
@@ -469,7 +469,7 @@ object frmMain: TfrmMain
           AnchorSideBottom.Control = cbRandomPreset
           Cursor = 63
           Left = 4
-          Height = 110
+          Height = 111
           Top = 24
           Width = 208
           Anchors = [akTop, akLeft, akRight, akBottom]
@@ -517,8 +517,8 @@ object frmMain: TfrmMain
           AnchorSideBottom.Control = gbRandom
           AnchorSideBottom.Side = asrBottom
           Left = 4
-          Height = 27
-          Top = 138
+          Height = 25
+          Top = 139
           Width = 156
           Anchors = [akLeft, akRight, akBottom]
           BorderSpacing.Left = 4
@@ -538,8 +538,8 @@ object frmMain: TfrmMain
         Cursor = crVSplit
         Left = 0
         Height = 5
-        Top = 284
-        Width = 218
+        Top = 288
+        Width = 220
         Align = alNone
         Anchors = [akLeft, akRight, akBottom]
         ResizeAnchor = akBottom
@@ -549,10 +549,10 @@ object frmMain: TfrmMain
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = vdtTiles
         AnchorSideBottom.Side = asrBottom
-        Left = 110
+        Left = 112
         Height = 23
         Hint = 'Append S or T to restrict the search to Statics or Terrain.'
-        Top = 253
+        Top = 257
         Width = 96
         Anchors = [akRight, akBottom]
         BorderSpacing.Right = 8
@@ -571,10 +571,10 @@ object frmMain: TfrmMain
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = tsTiles
         AnchorSideRight.Side = asrBottom
-        Left = 89
+        Left = 85
         Height = 23
         Top = 21
-        Width = 113
+        Width = 119
         Anchors = [akTop, akLeft, akRight]
         BorderSpacing.Right = 16
         OnEditingDone = edFilterEditingDone
@@ -585,10 +585,10 @@ object frmMain: TfrmMain
         AnchorSideLeft.Side = asrCenter
         AnchorSideTop.Control = cbTerrain
         AnchorSideTop.Side = asrBottom
-        Left = 3
+        Left = 4
         Height = 24
         Top = 32
-        Width = 71
+        Width = 65
         Caption = 'Statics'
         Checked = True
         OnChange = cbStaticsChange
@@ -601,7 +601,7 @@ object frmMain: TfrmMain
         Left = 4
         Height = 24
         Top = 8
-        Width = 69
+        Width = 65
         BorderSpacing.Left = 4
         BorderSpacing.Top = 8
         Caption = 'Terrain'
@@ -613,8 +613,8 @@ object frmMain: TfrmMain
     end
     object tsClients: TTabSheet
       Caption = 'Clients'
-      ClientHeight = 472
-      ClientWidth = 218
+      ClientHeight = 476
+      ClientWidth = 220
       object lbClients: TListBox
         Left = 0
         Height = 478
@@ -632,8 +632,8 @@ object frmMain: TfrmMain
     end
     object tsLocations: TTabSheet
       Caption = 'Locations'
-      ClientHeight = 472
-      ClientWidth = 218
+      ClientHeight = 476
+      ClientWidth = 220
       object btnClearLocations: TSpeedButton
         AnchorSideLeft.Control = btnDeleteLocation
         AnchorSideLeft.Side = asrBottom
@@ -851,6 +851,7 @@ object frmMain: TfrmMain
     end
     object tbSeparator1: TToolButton
       Left = 24
+      Height = 22
       Top = 2
       Width = 5
       Style = tbsDivider
@@ -911,6 +912,7 @@ object frmMain: TfrmMain
     end
     object tbSeparator3: TToolButton
       Left = 195
+      Height = 22
       Top = 2
       Width = 5
       Caption = 'tbSeparator3'
@@ -925,6 +927,7 @@ object frmMain: TfrmMain
     end
     object tbSeparator4: TToolButton
       Left = 269
+      Height = 22
       Top = 2
       Width = 5
       Caption = 'tbSeparator4'
@@ -956,6 +959,7 @@ object frmMain: TfrmMain
     end
     object tbSeparator5: TToolButton
       Left = 424
+      Height = 22
       Top = 2
       Width = 5
       Caption = 'tbSeparator5'
@@ -998,6 +1002,7 @@ object frmMain: TfrmMain
     end
     object tbSeparator2: TToolButton
       Left = 167
+      Height = 22
       Top = 2
       Width = 5
       Caption = 'tbSeparator2'
@@ -2734,4 +2739,4 @@ object frmMain: TfrmMain
     left = 368
     top = 208
   end
-end
\ No newline at end of file
+end