diff --git a/.hgignore b/.hgignore
index c359ec4..8f0665c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,2 +1,2 @@
 syntax: regexp
-^.*[.](?!((pas)|(lfm)|(lpr)|(lpi)|(inc)))[^.]+$
+(?<!\.(pas|lfm|lpr|lpi))$
diff --git a/README b/README
index 1054c9e..316e8ab 100644
--- a/README
+++ b/README
@@ -14,9 +14,6 @@ To build CentrED you need at least FreePascal 2.2.0 and a
 recent Lazarus (at least 0.9.24).
 You also have to have the following packages installed:
   - VirtualTrees from https://luipack.bountysource.com/wiki/virtualtreeview
-                 probably with applied VirtualTrees.patch to be compatible
-                 with current Lazarus revisions (included with the CentrED
-                 source)
   - LazOpenGLContext (included with Lazarus)
   - lNet by Almindor: http://wiki.lazarus.freepascal.org/lNet
 
@@ -46,4 +43,4 @@ Almindor for lNet and his support on how to use it efficently.
 Marek Mauder for the great Vampyre Imaging Library and also his support and extensions.
 Luiz Américo Pereira Câmara for his nice port of VirtualTrees.
 And last bot not least the whole FPC and Lazarus team for developing, maintaining
-and supporting such great development tools, which make life a lot easier.
\ No newline at end of file
+and supporting such great development tools, which make life a lot easier.
diff --git a/VirtualTrees.patch b/VirtualTrees.patch
deleted file mode 100644
index e1676b8..0000000
--- a/VirtualTrees.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Index: VirtualTrees.pas
-===================================================================
---- VirtualTrees.pas	(Revision 292)
-+++ VirtualTrees.pas	(Arbeitskopie)
-@@ -796,7 +796,7 @@
-     function DUnadvise(dwConnection: DWord): HResult; virtual; stdcall;
-     Function EnumDAvise(Out enumAdvise : IEnumStatData):HResult;virtual;StdCall;
-     function EnumFormatEtc(Direction: DWord; out EnumFormatEtc: IEnumFormatEtc): HResult; virtual; stdcall;
--    Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; virtual; STDCALl;
-+    Function GetCanonicalFormatTEtc(const pformatetcIn : tagFORMATETC;Out pformatetcOut : tagFORMATETC):HResult; virtual; STDCALl;
-     function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
-     function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
-     function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
-@@ -10657,9 +10657,9 @@
-   FIndent := 18;
- 
-   FPlusBM := TBitmap.Create;
--  FPlusBM.PixelFormat := OptimalPixelFormat;
-+  FPlusBM.PixelFormat := pf32bit;
-   FMinusBM := TBitmap.Create;
--  FMinusBM.PixelFormat := OptimalPixelFormat;
-+  FMinusBM.PixelFormat := pf32bit;
- 
-   //FBorderStyle := bsSingle;
-   FButtonStyle := bsRectangle;
-@@ -21505,8 +21505,8 @@
-     {$endif ThemeSupport}
-       with FCheckImages do
-       begin
--        DirectMaskBlt(PaintInfo.Canvas.Handle, XPos, YPos, Height, Height, Canvas.Handle,
--          Index * Height, 0, MaskHandle);
-+        MaskBlt(PaintInfo.Canvas.Handle, XPos, YPos, Height, Height, Canvas.Handle,
-+          Index * Height, 0, MaskHandle, Index * Height, 0);
-       end;
-   end;
-   Logger.ExitMethod([lcCheck],'PaintCheckImage');
-@@ -21606,8 +21606,8 @@
-     XPos := R.Right - ButtonX - Bitmap.Width;
-   Logger.SendBitmap([lcPaintBitmap],'NodeButton',Bitmap);
-   // Need to draw this masked.
--  DirectMaskBlt(Canvas.Handle, XPos, R.Top + ButtonY, TreeButtonSize, TreeButtonSize, Bitmap.Canvas.Handle,
--    0, 0, Bitmap.MaskHandle);
-+  MaskBlt(Canvas.Handle, XPos, R.Top + ButtonY, TreeButtonSize, TreeButtonSize, Bitmap.Canvas.Handle,
-+    0, 0, Bitmap.MaskHandle, 0, 0);
- 
-   Logger.ExitMethod([lcPaintDetails],'PaintNodeButton');
- end;
-@@ -26624,7 +26624,7 @@
-         NodeBitmap.Width := Window.Right - Window.Left;
-         Logger.Send([lcPaintDetails],'NodeBitmap.Width',NodeBitmap.Width);
-         // Make sure the buffer bitmap and target bitmap use the same transformation mode.
--        SetMapMode(NodeBitmap.Canvas.Handle, GetMapMode(TargetCanvas.Handle));
-+        //SetMapMode(NodeBitmap.Canvas.Handle, GetMapMode(TargetCanvas.Handle));
- 
-         // For quick checks some intermediate variables are used.
-         UseBackground := (toShowBackground in FOptions.FPaintOptions) and (FBackground.Graphic is TBitmap) and