Index: /oup/current/FileClasses/_Extensions.pas
===================================================================
--- /oup/current/FileClasses/_Extensions.pas	(revision 243)
+++ /oup/current/FileClasses/_Extensions.pas	(revision 244)
@@ -26,4 +26,5 @@
       function GetChild(ID: Integer): TTreeElement; override;
       function GetCaption: String; override;
+      function GetType: String; override;
     private
       FExtensions: array of TExtension;
@@ -103,5 +104,5 @@
 function TExtensions.GetCaption: String;
 begin
-  Result := '';
+  Result := 'Extensions';
 end;
 
@@ -157,4 +158,9 @@
 end;
 
+function TExtensions.GetType: String;
+begin
+  Result := '';
+end;
+
 procedure TExtensions.AddExt(Ext: String);
 var
Index: /oup/current/Global/OniImgClass.pas
===================================================================
--- /oup/current/Global/OniImgClass.pas	(revision 243)
+++ /oup/current/Global/OniImgClass.pas	(revision 244)
@@ -414,7 +414,7 @@
     images[i] := TOniImage.Create;
     images[i].LoadFromTXMP(ConnectionID, link);
-    SetLength(FImages, 1);
-    NewImage(width, height, ifA1R5G5B5, FImages[0]);
-  end;
+  end;
+  SetLength(FImages, 1);
+  NewImage(width, height, images[0].Format {ifA1R5G5B5}, FImages[0]);
   for y := 0 to rows - 1 do
   begin
@@ -426,10 +426,10 @@
       for i := 0 to x do
         if i < x then
-          x_start := x_start + images[i].Image[0].Width;
+          x_start := x_start + images[i].Image[1].Width;
       for i := 0 to y do
         if i < y then
-          y_start := y_start + images[i].Image[0].Height;
-      CopyRect(images[imgid].Image[0], 0, 0, images[imgid].Image[0].Width,
-          images[imgid].Image[0].Height, FImages[0], x_start, y_start);
+          y_start := y_start + images[i].Image[1].Height; 
+      CopyRect(images[imgid].Image[1], 0, 0, images[imgid].Image[1].Width,
+          images[imgid].Image[1].Height, FImages[0], x_start, y_start);
     end;
   end;
Index: /oup/current/Tools/MetaEditor.dfm
===================================================================
--- /oup/current/Tools/MetaEditor.dfm	(revision 243)
+++ /oup/current/Tools/MetaEditor.dfm	(revision 244)
@@ -85,8 +85,4 @@
       object tab_hex: TTabSheet
         Caption = 'Binary Edit'
-        ExplicitLeft = 0
-        ExplicitTop = 0
-        ExplicitWidth = 0
-        ExplicitHeight = 0
         object splitter_hex_1: TSplitter
           Left = 0
Index: /oup/current/Tools/MetaEditor.pas
===================================================================
--- /oup/current/Tools/MetaEditor.pas	(revision 243)
+++ /oup/current/Tools/MetaEditor.pas	(revision 244)
@@ -101,4 +101,5 @@
   data: TNodeData;
   node: PVirtualNode;
+  basenode: PVirtualNode;
 begin
   if FConnectionID <> TreeElem.ConnectionID then
@@ -107,8 +108,10 @@
   VST.Clear;
   VST.BeginUpdate;
+  data.Field := root;
+  basenode := AddVSTEntry(VST, nil, data);
   for i := 0 to root.ChildCount - 1 do
   begin
     data.Field := root.Child[i];
-    node := AddVSTEntry(VST, nil, data);
+    node := AddVSTEntry(VST, basenode, data);
     if data.Field.ChildCount > 0 then
       VST.HasChildren[node] := True;
Index: /oup/current/Tools/Preview.dfm
===================================================================
--- /oup/current/Tools/Preview.dfm	(revision 243)
+++ /oup/current/Tools/Preview.dfm	(revision 244)
@@ -47,5 +47,4 @@
         Visible = False
         OnResize = panel_buttonsResize
-        ExplicitWidth = 283
         object btn_dec: TButton
           Left = 0
Index: /oup/current/Tools/Preview.pas
===================================================================
--- /oup/current/Tools/Preview.pas	(revision 243)
+++ /oup/current/Tools/Preview.pas	(revision 244)
@@ -6,5 +6,5 @@
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, _TemplateFileList, Menus, StdCtrls, ExtCtrls, Buttons,
-  TypeDefs, OniImgClass;
+  TypeDefs, OniImgClass, VirtualTrees, ComCtrls;
 
 type