Index: /oup/current/Tools/BinEdit.dfm
===================================================================
--- /oup/current/Tools/BinEdit.dfm	(revision 220)
+++ /oup/current/Tools/BinEdit.dfm	(revision 221)
@@ -4,13 +4,25 @@
   OnCreate = FormCreate
   OnKeyUp = FormKeyUp
-  ExplicitWidth = 606
-  ExplicitHeight = 584
   PixelsPerInch = 96
   TextHeight = 13
   inherited panel_basecontent: TPanel
     inherited panel_files: TPanel
-      inherited filelist: TListBox
-        Height = 347
-        ExplicitHeight = 347
+      inherited FilePages: TPageControl
+        Height = 471
+        inherited tab_files: TTabSheet
+          ExplicitWidth = 191
+          ExplicitHeight = 443
+          inherited panel_extension: TPanel
+            ExplicitWidth = 191
+            inherited combo_extension: TComboBox
+              ExplicitWidth = 190
+            end
+          end
+          inherited filelist: TListBox
+            Height = 318
+            ExplicitWidth = 191
+            ExplicitHeight = 318
+          end
+        end
       end
       object panel_imexport: TPanel
@@ -21,5 +33,5 @@
         Align = alBottom
         BevelOuter = bvNone
-        TabOrder = 2
+        TabOrder = 1
         DesignSize = (
           200
Index: /oup/current/Tools/BinEdit.pas
===================================================================
--- /oup/current/Tools/BinEdit.pas	(revision 220)
+++ /oup/current/Tools/BinEdit.pas	(revision 221)
@@ -8,5 +8,5 @@
   StdCtrls, Menus, ExtCtrls, Buttons,
   Data, TypeDefs, ConnectionManager, Template,
-  _TemplateFileList, VTHeaderPopup;
+  _TemplateFileList, VTHeaderPopup, ComCtrls;
 
 type
Index: /oup/current/Tools/RawEdit.dfm
===================================================================
--- /oup/current/Tools/RawEdit.dfm	(revision 220)
+++ /oup/current/Tools/RawEdit.dfm	(revision 221)
@@ -1,166 +1,183 @@
 inherited Form_RawEdit: TForm_RawEdit
-  Caption = 'RawEdit'
-  KeyPreview = True
+  Caption = 'Form_RawEdit'
   OnCloseQuery = FormCloseQuery
   OnCreate = FormCreate
   OnKeyUp = FormKeyUp
-  ExplicitWidth = 500
-  ExplicitHeight = 450
   PixelsPerInch = 96
   TextHeight = 13
-  inherited panel_files: TPanel
-    object Splitter4: TSplitter [0]
-      Left = 0
-      Top = 205
-      Width = 200
-      Height = 8
-      Cursor = crVSplit
-      Align = alBottom
-      AutoSnap = False
-      Beveled = True
-      MinSize = 150
-      ExplicitLeft = 3
-      ExplicitTop = 89
-    end
-    inherited filelist: TListBox
-      Height = 52
-      ExplicitHeight = 52
-    end
-    object panel_imexport: TPanel
-      Left = 0
-      Top = 363
-      Width = 200
-      Height = 60
-      Align = alBottom
-      BevelOuter = bvNone
-      TabOrder = 3
-      DesignSize = (
-        200
-        60)
-      object btn_export: TButton
-        Left = 4
-        Top = 4
-        Width = 190
-        Height = 25
-        Anchors = [akLeft, akTop, akRight]
-        Caption = 'Export to file...'
+  inherited panel_basecontent: TPanel
+    inherited panel_files: TPanel
+      inherited FilePages: TPageControl
+        inherited tab_files: TTabSheet
+          object Splitter4: TSplitter [0]
+            Left = 0
+            Top = 285
+            Width = 190
+            Height = 8
+            Cursor = crVSplit
+            Align = alBottom
+            AutoSnap = False
+            Beveled = True
+            MinSize = 150
+            ExplicitTop = 125
+          end
+          inherited filelist: TListBox
+            Height = 160
+          end
+          object panel_imexport: TPanel
+            Left = 0
+            Top = 443
+            Width = 190
+            Height = 60
+            Align = alBottom
+            BevelOuter = bvNone
+            TabOrder = 2
+            ExplicitTop = 363
+            ExplicitWidth = 200
+            DesignSize = (
+              190
+              60)
+            object btn_export: TButton
+              Left = 4
+              Top = 4
+              Width = 183
+              Height = 25
+              Anchors = [akLeft, akTop, akRight]
+              Caption = 'Export to file...'
+              TabOrder = 0
+              OnClick = btn_exportClick
+            end
+            object btn_import: TButton
+              Left = 4
+              Top = 32
+              Width = 183
+              Height = 25
+              Anchors = [akLeft, akTop, akRight]
+              Caption = 'Import from file...'
+              TabOrder = 1
+              OnClick = btn_importClick
+            end
+          end
+          object GroupBox1: TGroupBox
+            Left = 0
+            Top = 293
+            Width = 190
+            Height = 150
+            Align = alBottom
+            Caption = '2. Select .dat-link-offset'
+            TabOrder = 3
+            ExplicitTop = 213
+            ExplicitWidth = 200
+            object list_offset: TListBox
+              Left = 2
+              Top = 15
+              Width = 186
+              Height = 133
+              Align = alClient
+              ItemHeight = 13
+              TabOrder = 0
+              OnClick = list_offsetClick
+            end
+          end
+        end
+      end
+    end
+    inherited panel_content: TPanel
+      object Splitter2: TSplitter
+        Left = 0
+        Top = 300
+        Width = 390
+        Height = 8
+        Cursor = crVSplit
+        Align = alTop
+        AutoSnap = False
+        Beveled = True
+        MinSize = 40
+      end
+      object hex: TMPHexEditor
+        Left = 0
+        Top = 0
+        Width = 390
+        Height = 300
+        Cursor = crIBeam
+        Align = alTop
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -16
+        Font.Name = 'Courier'
+        Font.Style = []
+        OnKeyUp = hexKeyUp
+        ParentFont = False
         TabOrder = 0
-        OnClick = btn_exportClick
-      end
-      object btn_import: TButton
-        Left = 4
-        Top = 32
-        Width = 190
-        Height = 25
-        Anchors = [akLeft, akTop, akRight]
-        Caption = 'Import from file...'
+        BytesPerRow = 16
+        Translation = tkAsIs
+        OffsetFormat = '6!10:0x|'
+        Colors.Background = clWindow
+        Colors.ChangedBackground = clWindow
+        Colors.ChangedText = clRed
+        Colors.CursorFrame = clNavy
+        Colors.Offset = clBlack
+        Colors.OddColumn = clBlue
+        Colors.EvenColumn = clNavy
+        Colors.CurrentOffsetBackground = clBtnShadow
+        Colors.OffsetBackGround = clBtnFace
+        Colors.CurrentOffset = clBtnHighlight
+        Colors.Grid = clBtnFace
+        Colors.NonFocusCursorFrame = clAqua
+        Colors.ActiveFieldBackground = clWindow
+        FocusFrame = True
+        NoSizeChange = True
+        AllowInsertMode = False
+        DrawGridLines = False
+        Version = 'May 23, 2005; '#169' markus stephany, vcl[at]mirkes[dot]de'
+        OnChange = hexChange
+        ShowPositionIfNotFocused = True
+        OnSelectionChanged = hexSelectionChanged
+        ExplicitWidth = 283
+      end
+      object value_viewer: TWrapGrid
+        Left = 0
+        Top = 308
+        Width = 390
+        Height = 224
+        Align = alClient
+        ColCount = 2
+        DefaultColWidth = 80
+        DefaultRowHeight = 18
+        FixedCols = 0
+        RowCount = 8
+        FixedRows = 0
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goColSizing]
+        ParentFont = False
+        ScrollBars = ssVertical
         TabOrder = 1
-        OnClick = btn_importClick
-      end
-    end
-    object GroupBox1: TGroupBox
-      Left = 0
-      Top = 213
-      Width = 200
-      Height = 150
-      Align = alBottom
-      Caption = '2. Select .dat-link-offset'
-      TabOrder = 2
-      object list_offset: TListBox
-        Left = 2
-        Top = 15
-        Width = 196
-        Height = 133
-        Align = alClient
-        ItemHeight = 13
-        TabOrder = 0
-        OnClick = list_offsetClick
-      end
-    end
-  end
-  inherited content: TPanel
-    object Splitter2: TSplitter
-      Left = 0
-      Top = 300
-      Width = 283
-      Height = 9
-      Cursor = crVSplit
-      Align = alTop
-      AutoSnap = False
-      Beveled = True
-      MinSize = 40
-      ExplicitTop = 414
-    end
-    object hex: TMPHexEditor
-      Left = 0
-      Top = 0
-      Width = 283
-      Height = 300
-      Cursor = crIBeam
-      Align = alTop
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -16
-      Font.Name = 'Courier'
-      Font.Style = []
-      OnKeyUp = hexKeyUp
-      ParentFont = False
-      TabOrder = 0
-      BytesPerRow = 16
-      Translation = tkAsIs
-      OffsetFormat = '6!10:0x|'
-      Colors.Background = clWindow
-      Colors.ChangedBackground = clWindow
-      Colors.ChangedText = clRed
-      Colors.CursorFrame = clNavy
-      Colors.Offset = clBlack
-      Colors.OddColumn = clBlue
-      Colors.EvenColumn = clNavy
-      Colors.CurrentOffsetBackground = clBtnShadow
-      Colors.OffsetBackGround = clBtnFace
-      Colors.CurrentOffset = clBtnHighlight
-      Colors.Grid = clBtnFace
-      Colors.NonFocusCursorFrame = clAqua
-      Colors.ActiveFieldBackground = clWindow
-      FocusFrame = True
-      NoSizeChange = True
-      AllowInsertMode = False
-      DrawGridLines = False
-      Version = 'May 23, 2005; '#169' markus stephany, vcl[at]mirkes[dot]de'
-      OnChange = hexChange
-      ShowPositionIfNotFocused = True
-      OnSelectionChanged = hexSelectionChanged
-    end
-    object value_viewer: TWrapGrid
-      Left = 0
-      Top = 309
-      Width = 283
-      Height = 114
-      Align = alClient
-      ColCount = 2
-      DefaultColWidth = 80
-      DefaultRowHeight = 18
-      FixedCols = 0
-      RowCount = 8
-      FixedRows = 0
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = []
-      Options = [goFixedVertLine, goFixedHorzLine, goVertLine, goHorzLine, goColSizing]
-      ParentFont = False
-      PopupMenu = value_viewer_context
-      ScrollBars = ssVertical
-      TabOrder = 1
-      OnDblClick = value_viewerDblClick
-      OnMouseDown = value_viewerMouseDown
-    end
-  end
-  object value_viewer_context: TPopupMenu [3]
+        OnDblClick = value_viewerDblClick
+        OnMouseDown = value_viewerMouseDown
+        ExplicitTop = 309
+        ExplicitWidth = 283
+        ExplicitHeight = 114
+      end
+    end
+  end
+  object opend: TOpenDialog
+    Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing]
+    Left = 88
+    Top = 396
+  end
+  object saved: TSaveDialog
+    Options = [ofOverwritePrompt, ofPathMustExist, ofEnableSizing]
+    Left = 88
+    Top = 420
+  end
+  object value_viewer_context: TPopupMenu
     AutoHotkeys = maManual
     OnPopup = value_viewer_contextPopup
-    Left = 368
-    Top = 264
+    Left = 380
+    Top = 388
     object value_viewer_context_copy: TMenuItem
       Caption = 'Copy to &clipboard'
@@ -169,32 +186,17 @@
     object value_viewer_context_copyasdec: TMenuItem
       Caption = 'Copy to clipboard (as &dec)'
-      OnClick = value_viewer_context_copyClick
     end
     object value_viewer_context_copyasfloat: TMenuItem
       Caption = 'Copy to clipboard (as &float)'
-      OnClick = value_viewer_context_copyClick
     end
     object value_viewer_context_copyasbitset: TMenuItem
       Caption = 'Copy to clipboard (as &bitset)'
-      OnClick = value_viewer_context_copyClick
     end
     object value_viewer_context_copyasstring: TMenuItem
       Caption = 'Copy to clipboard (as &string)'
-      OnClick = value_viewer_context_copyClick
     end
     object value_viewer_context_copyashex: TMenuItem
       Caption = 'Copy to clipboard (as &hex)'
-      OnClick = value_viewer_context_copyClick
-    end
-  end
-  object opend: TOpenDialog [4]
-    Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing]
-    Left = 128
-    Top = 256
-  end
-  object saved: TSaveDialog [5]
-    Options = [ofOverwritePrompt, ofPathMustExist, ofEnableSizing]
-    Left = 128
-    Top = 280
+    end
   end
 end
Index: /oup/current/Tools/RawEdit.pas
===================================================================
--- /oup/current/Tools/RawEdit.pas	(revision 220)
+++ /oup/current/Tools/RawEdit.pas	(revision 221)
@@ -1,13 +1,13 @@
 unit RawEdit;
+
 interface
+
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, Template, StdCtrls, ExtCtrls, Menus, Grids, Wrapgrid,
-  MPHexEditor, Clipbrd, StrUtils, TypeDefs,
-  Data, Functions, DatStructureLoader, ConnectionManager, Buttons;
+  Dialogs, _TemplateFileList, Menus, StdCtrls, ExtCtrls, Buttons, ComCtrls,
+  TypeDefs, Grids, Wrapgrid, MPHexEditor;
 
 type
-  TForm_RawEdit = class(TForm_ToolTemplate)
-    Splitter4: TSplitter;
+  TForm_RawEdit = class(TForm_TemplateFileList)
     panel_imexport: TPanel;
     btn_export: TButton;
@@ -15,7 +15,10 @@
     GroupBox1: TGroupBox;
     list_offset: TListBox;
+    Splitter4: TSplitter;
+    opend: TOpenDialog;
+    saved: TSaveDialog;
     hex: TMPHexEditor;
+    value_viewer: TWrapGrid;
     Splitter2: TSplitter;
-    value_viewer: TWrapGrid;
     value_viewer_context: TPopupMenu;
     value_viewer_context_copy: TMenuItem;
@@ -25,6 +28,4 @@
     value_viewer_context_copyasstring: TMenuItem;
     value_viewer_context_copyashex: TMenuItem;
-    opend: TOpenDialog;
-    saved: TSaveDialog;
     procedure list_offsetClick(Sender: TObject);
     procedure NewFile(fileinfo: TFileInfo);
@@ -58,10 +59,10 @@
   end;
 
-var
-  Form_RawEdit: TForm_RawEdit;
 
 implementation
 {$R *.dfm}
-uses Main, ValueEdit, RawList;
+uses
+  _TemplateFile, ValueEdit, ConnectionManager, StrUtils, Functions, RawList,
+  Data, Clipbrd;
 
 procedure TForm_RawEdit.NewFile(fileinfo: TFileInfo);
@@ -813,2 +814,4 @@
   AddToolListEntry('rawedit', 'Binary .raw-Editor', '');
 end.
+
+
Index: /oup/current/Tools/_TemplateFileList.dfm
===================================================================
--- /oup/current/Tools/_TemplateFileList.dfm	(revision 220)
+++ /oup/current/Tools/_TemplateFileList.dfm	(revision 221)
@@ -1,4 +1,6 @@
 inherited Form_TemplateFileList: TForm_TemplateFileList
   Caption = 'Form_TemplateFileList'
+  ExplicitWidth = 606
+  ExplicitHeight = 584
   PixelsPerInch = 96
   TextHeight = 13
@@ -11,5 +13,5 @@
       AutoSnap = False
       Beveled = True
-      MinSize = 150
+      MinSize = 175
     end
     object panel_files: TPanel
@@ -21,237 +23,257 @@
       BevelOuter = bvNone
       TabOrder = 0
-      object filelist: TListBox
-        Left = 0
-        Top = 125
-        Width = 200
-        Height = 407
+      object FilePages: TPageControl
+        AlignWithMargins = True
+        Left = 1
+        Top = 1
+        Width = 198
+        Height = 531
+        Margins.Left = 1
+        Margins.Top = 1
+        Margins.Right = 1
+        Margins.Bottom = 0
+        ActivePage = tab_files
         Align = alClient
-        ItemHeight = 13
         TabOrder = 0
-        OnClick = listClick
-        OnMouseDown = listMouseDown
-      end
-      object panel_extension: TPanel
-        Left = 0
-        Top = 0
-        Width = 200
-        Height = 125
-        Align = alTop
-        BevelOuter = bvNone
-        TabOrder = 1
-        DesignSize = (
-          200
-          125)
-        object label_sort2: TLabel
-          Left = 98
-          Top = 105
-          Width = 17
-          Height = 18
-          AutoSize = False
-          Caption = '.'
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -13
-          Font.Name = 'Tahoma'
-          Font.Style = [fsBold]
-          ParentFont = False
-        end
-        object label_sort1: TLabel
-          Left = 45
-          Top = 105
-          Width = 17
-          Height = 18
-          AutoSize = False
-          Caption = '-'
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -13
-          Font.Name = 'Tahoma'
-          Font.Style = [fsBold]
-          ParentFont = False
-        end
-        object label_extension: TLabel
-          Left = 0
-          Top = 62
-          Width = 100
-          Height = 17
-          AutoSize = False
-          Caption = 'Filter by &extension:'
-          FocusControl = combo_extension
-        end
-        object btn_sort_id_asc: TSpeedButton
-          Left = 1
-          Top = 101
-          Width = 20
-          Height = 22
-          Hint = 'Sort files by id, ascending'
-          GroupIndex = 1
-          Down = True
-          Glyph.Data = {
-            F6000000424DF600000000000000760000002800000010000000100000000100
-            0400000000008000000000000000000000001000000000000000C0C0C0000000
-            9900990000000000000000000000000000000000000000000000000000000000
-            0000000000000000000000000000000000000000000000000000000000000000
-            0000000001100000300000001001000030000000000100033300000001110003
-            3300000010010033333000001001000030000000011000003000000000000000
-            3000000002200000300000002002000030000000200200003000000020020000
-            3000000020020000300000002002000030000000022000003000}
-          ParentShowHint = False
-          ShowHint = True
-          OnClick = btn_sortClick
-        end
-        object btn_sort_id_desc: TSpeedButton
-          Left = 21
-          Top = 101
-          Width = 20
-          Height = 22
-          Hint = 'Sort files by id, descending'
-          GroupIndex = 1
-          Glyph.Data = {
-            F6000000424DF600000000000000760000002800000010000000100000000100
-            0400000000008000000000000000000000001000000000000000C0C0C0000000
-            9900990000000000000000000000000000000000000000000000000000000000
-            0000000000000000000000000000000000000000000000000000000000000000
-            0000000002200000300000002002000030000000200200033300000020020003
-            3300000020020033333000002002000030000000022000003000000000000000
-            3000000001100000300000001001000030000000000100003000000001110000
-            3000000010010000300000001001000030000000011000003000}
-          ParentShowHint = False
-          ShowHint = True
-          OnClick = btn_sortClick
-        end
-        object btn_sort_name_asc: TSpeedButton
-          Left = 56
-          Top = 101
-          Width = 20
-          Height = 22
-          Hint = 'Sort files by name, ascending'
-          GroupIndex = 1
-          Glyph.Data = {
-            F6000000424DF600000000000000760000002800000010000000100000000100
-            0400000000008000000000000000000000001000000000000000C0C0C0000000
-            9900990000000000000000000000000000000000000000000000000000000000
-            0000000000000000000000000000000000000000000000000000000000000000
-            0000011111100000300001100010000030000011000000033300000110000003
-            3300000011000033333001000110000030000111111000003000000000000000
-            3000022202220000300000200020000030000022222000003000000202000000
-            3000000222000000300000002000000030000000200000003000}
-          ParentShowHint = False
-          ShowHint = True
-          OnClick = btn_sortClick
-        end
-        object btn_sort_name_desc: TSpeedButton
-          Left = 76
-          Top = 101
-          Width = 20
-          Height = 22
-          Hint = 'Sort files by name, descending'
-          GroupIndex = 1
-          Glyph.Data = {
-            F6000000424DF600000000000000760000002800000010000000100000000100
-            0400000000008000000000000000000000001000000000000000C0C0C0000000
-            9900990000000000000000000000000000000000000000000000000000000000
-            0000000000000000000000000000000000000000000000000000000000000000
-            0000022202220000300000200020000030000022222000033300000202000003
-            3300000222000033333000002000000030000000200000003000000000000000
-            3000011111100000300001100010000030000011000000003000000110000000
-            3000000011000000300001000110000030000111111000003000}
-          ParentShowHint = False
-          ShowHint = True
-          OnClick = btn_sortClick
-        end
-        object btn_sort_ext_asc: TSpeedButton
-          Left = 106
-          Top = 101
-          Width = 20
-          Height = 22
-          Hint = 'Sort files by extension, ascending'
-          GroupIndex = 1
-          Glyph.Data = {
-            F6000000424DF600000000000000760000002800000010000000100000000100
-            0400000000008000000000000000000000001000000000000000C0C0C0000000
-            9900990000000000000000000000000000000000000000000000000000000000
-            0000000000000000000000000000000000000000000000000000000000000000
-            0000011111100000300001100010000030000011000000033300000110000003
-            3300000011000033333001000110000030000111111000003000000000000000
-            3000022202220000300000200020000030000022222000003000000202000000
-            3000000222000000300000002000000030000000200000003000}
-          ParentShowHint = False
-          ShowHint = True
-          OnClick = btn_sortClick
-        end
-        object btn_sort_ext_desc: TSpeedButton
-          Left = 126
-          Top = 101
-          Width = 20
-          Height = 22
-          Hint = 'Sort files by extension, descending'
-          GroupIndex = 1
-          Glyph.Data = {
-            F6000000424DF600000000000000760000002800000010000000100000000100
-            0400000000008000000000000000000000001000000000000000C0C0C0000000
-            9900990000000000000000000000000000000000000000000000000000000000
-            0000000000000000000000000000000000000000000000000000000000000000
-            0000022202220000300000200020000030000022222000033300000202000003
-            3300000222000033333000002000000030000000200000003000000000000000
-            3000011111100000300001100010000030000011000000003000000110000000
-            3000000011000000300001000110000030000111111000003000}
-          ParentShowHint = False
-          ShowHint = True
-          OnClick = btn_sortClick
-        end
-        object bevel_filelist: TBevel
-          Left = 0
-          Top = 0
-          Width = 199
-          Height = 3
-          Anchors = [akLeft, akTop, akRight]
-          Style = bsRaised
-        end
-        object combo_extension: TComboBox
-          Left = 0
-          Top = 76
-          Width = 196
-          Height = 21
-          Style = csDropDownList
-          Anchors = [akLeft, akTop, akRight]
-          DropDownCount = 20
-          Font.Charset = DEFAULT_CHARSET
-          Font.Color = clWindowText
-          Font.Height = -11
-          Font.Name = 'Courier'
-          Font.Style = []
-          ItemHeight = 13
-          ParentFont = False
-          Sorted = True
-          TabOrder = 3
-          OnClick = combo_extensionClick
-        end
-        object check_zerobyte: TCheckBox
-          Left = 0
-          Top = 44
-          Width = 130
-          Height = 13
-          Caption = 'Show &zero-byte files'
-          TabOrder = 2
-          OnClick = check_zerobyteClick
-        end
-        object edit_filtername: TEdit
-          Left = 0
-          Top = 20
-          Width = 196
-          Height = 18
-          Anchors = [akLeft, akTop, akRight]
-          AutoSize = False
-          TabOrder = 1
-        end
-        object check_filtername: TCheckBox
-          Left = 0
-          Top = 5
-          Width = 130
-          Height = 15
-          Caption = 'Filter by file&name:'
-          TabOrder = 0
-          OnClick = check_filternameClick
+        ExplicitLeft = -41
+        ExplicitTop = 28
+        ExplicitWidth = 241
+        ExplicitHeight = 381
+        object tab_files: TTabSheet
+          Caption = 'Files'
+          ExplicitWidth = 233
+          ExplicitHeight = 353
+          object panel_extension: TPanel
+            Left = 0
+            Top = 0
+            Width = 190
+            Height = 125
+            Align = alTop
+            BevelOuter = bvNone
+            TabOrder = 0
+            ExplicitWidth = 233
+            DesignSize = (
+              190
+              125)
+            object label_sort2: TLabel
+              Left = 98
+              Top = 105
+              Width = 17
+              Height = 18
+              AutoSize = False
+              Caption = '.'
+              Font.Charset = DEFAULT_CHARSET
+              Font.Color = clWindowText
+              Font.Height = -13
+              Font.Name = 'Tahoma'
+              Font.Style = [fsBold]
+              ParentFont = False
+            end
+            object label_sort1: TLabel
+              Left = 45
+              Top = 105
+              Width = 17
+              Height = 18
+              AutoSize = False
+              Caption = '-'
+              Font.Charset = DEFAULT_CHARSET
+              Font.Color = clWindowText
+              Font.Height = -13
+              Font.Name = 'Tahoma'
+              Font.Style = [fsBold]
+              ParentFont = False
+            end
+            object label_extension: TLabel
+              Left = 0
+              Top = 59
+              Width = 100
+              Height = 17
+              AutoSize = False
+              Caption = 'Filter by &extension:'
+              FocusControl = combo_extension
+            end
+            object btn_sort_id_asc: TSpeedButton
+              Left = 1
+              Top = 101
+              Width = 20
+              Height = 22
+              Hint = 'Sort files by id, ascending'
+              GroupIndex = 1
+              Down = True
+              Glyph.Data = {
+                F6000000424DF600000000000000760000002800000010000000100000000100
+                0400000000008000000000000000000000001000000000000000C0C0C0000000
+                9900990000000000000000000000000000000000000000000000000000000000
+                0000000000000000000000000000000000000000000000000000000000000000
+                0000000001100000300000001001000030000000000100033300000001110003
+                3300000010010033333000001001000030000000011000003000000000000000
+                3000000002200000300000002002000030000000200200003000000020020000
+                3000000020020000300000002002000030000000022000003000}
+              ParentShowHint = False
+              ShowHint = True
+              OnClick = btn_sortClick
+            end
+            object btn_sort_id_desc: TSpeedButton
+              Left = 21
+              Top = 101
+              Width = 20
+              Height = 22
+              Hint = 'Sort files by id, descending'
+              GroupIndex = 1
+              Glyph.Data = {
+                F6000000424DF600000000000000760000002800000010000000100000000100
+                0400000000008000000000000000000000001000000000000000C0C0C0000000
+                9900990000000000000000000000000000000000000000000000000000000000
+                0000000000000000000000000000000000000000000000000000000000000000
+                0000000002200000300000002002000030000000200200033300000020020003
+                3300000020020033333000002002000030000000022000003000000000000000
+                3000000001100000300000001001000030000000000100003000000001110000
+                3000000010010000300000001001000030000000011000003000}
+              ParentShowHint = False
+              ShowHint = True
+              OnClick = btn_sortClick
+            end
+            object btn_sort_name_asc: TSpeedButton
+              Left = 56
+              Top = 101
+              Width = 20
+              Height = 22
+              Hint = 'Sort files by name, ascending'
+              GroupIndex = 1
+              Glyph.Data = {
+                F6000000424DF600000000000000760000002800000010000000100000000100
+                0400000000008000000000000000000000001000000000000000C0C0C0000000
+                9900990000000000000000000000000000000000000000000000000000000000
+                0000000000000000000000000000000000000000000000000000000000000000
+                0000011111100000300001100010000030000011000000033300000110000003
+                3300000011000033333001000110000030000111111000003000000000000000
+                3000022202220000300000200020000030000022222000003000000202000000
+                3000000222000000300000002000000030000000200000003000}
+              ParentShowHint = False
+              ShowHint = True
+              OnClick = btn_sortClick
+            end
+            object btn_sort_name_desc: TSpeedButton
+              Left = 76
+              Top = 101
+              Width = 20
+              Height = 22
+              Hint = 'Sort files by name, descending'
+              GroupIndex = 1
+              Glyph.Data = {
+                F6000000424DF600000000000000760000002800000010000000100000000100
+                0400000000008000000000000000000000001000000000000000C0C0C0000000
+                9900990000000000000000000000000000000000000000000000000000000000
+                0000000000000000000000000000000000000000000000000000000000000000
+                0000022202220000300000200020000030000022222000033300000202000003
+                3300000222000033333000002000000030000000200000003000000000000000
+                3000011111100000300001100010000030000011000000003000000110000000
+                3000000011000000300001000110000030000111111000003000}
+              ParentShowHint = False
+              ShowHint = True
+              OnClick = btn_sortClick
+            end
+            object btn_sort_ext_asc: TSpeedButton
+              Left = 106
+              Top = 101
+              Width = 20
+              Height = 22
+              Hint = 'Sort files by extension, ascending'
+              GroupIndex = 1
+              Glyph.Data = {
+                F6000000424DF600000000000000760000002800000010000000100000000100
+                0400000000008000000000000000000000001000000000000000C0C0C0000000
+                9900990000000000000000000000000000000000000000000000000000000000
+                0000000000000000000000000000000000000000000000000000000000000000
+                0000011111100000300001100010000030000011000000033300000110000003
+                3300000011000033333001000110000030000111111000003000000000000000
+                3000022202220000300000200020000030000022222000003000000202000000
+                3000000222000000300000002000000030000000200000003000}
+              ParentShowHint = False
+              ShowHint = True
+              OnClick = btn_sortClick
+            end
+            object btn_sort_ext_desc: TSpeedButton
+              Left = 126
+              Top = 101
+              Width = 20
+              Height = 22
+              Hint = 'Sort files by extension, descending'
+              GroupIndex = 1
+              Glyph.Data = {
+                F6000000424DF600000000000000760000002800000010000000100000000100
+                0400000000008000000000000000000000001000000000000000C0C0C0000000
+                9900990000000000000000000000000000000000000000000000000000000000
+                0000000000000000000000000000000000000000000000000000000000000000
+                0000022202220000300000200020000030000022222000033300000202000003
+                3300000222000033333000002000000030000000200000003000000000000000
+                3000011111100000300001100010000030000011000000003000000110000000
+                3000000011000000300001000110000030000111111000003000}
+              ParentShowHint = False
+              ShowHint = True
+              OnClick = btn_sortClick
+            end
+            object combo_extension: TComboBox
+              Left = 0
+              Top = 74
+              Width = 189
+              Height = 21
+              Style = csDropDownList
+              Anchors = [akLeft, akTop, akRight]
+              DropDownCount = 20
+              Font.Charset = DEFAULT_CHARSET
+              Font.Color = clWindowText
+              Font.Height = -11
+              Font.Name = 'Courier'
+              Font.Style = []
+              ItemHeight = 13
+              ParentFont = False
+              Sorted = True
+              TabOrder = 3
+              OnClick = combo_extensionClick
+              ExplicitWidth = 232
+            end
+            object check_zerobyte: TCheckBox
+              Left = 0
+              Top = 40
+              Width = 130
+              Height = 13
+              Caption = 'Show &zero-byte files'
+              TabOrder = 2
+              OnClick = check_zerobyteClick
+            end
+            object edit_filtername: TEdit
+              Left = 0
+              Top = 16
+              Width = 189
+              Height = 18
+              Anchors = [akLeft, akTop, akRight]
+              AutoSize = False
+              TabOrder = 1
+              ExplicitWidth = 232
+            end
+            object check_filtername: TCheckBox
+              Left = 0
+              Top = 0
+              Width = 130
+              Height = 15
+              Caption = 'Filter by file&name:'
+              TabOrder = 0
+              OnClick = check_filternameClick
+            end
+          end
+          object filelist: TListBox
+            Left = 0
+            Top = 125
+            Width = 190
+            Height = 378
+            Align = alClient
+            ItemHeight = 13
+            TabOrder = 1
+            OnClick = listClick
+            OnMouseDown = listMouseDown
+            ExplicitWidth = 233
+            ExplicitHeight = 228
+          end
         end
       end
Index: /oup/current/Tools/_TemplateFileList.pas
===================================================================
--- /oup/current/Tools/_TemplateFileList.pas	(revision 220)
+++ /oup/current/Tools/_TemplateFileList.pas	(revision 221)
@@ -6,10 +6,21 @@
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, _TemplateFile, StdCtrls, ExtCtrls, Menus, Buttons,
-  TypeDefs;
+  ComCtrls, TypeDefs;
 
 type
   TForm_TemplateFileList = class(TForm_TemplateFile)
     panel_files: TPanel;
-    filelist: TListBox;
+    splitter_content: TSplitter;
+    panel_content: TPanel;
+    filepopup: TPopupMenu;
+    popup_separator2: TMenuItem;
+    popup_linkshere: TMenuItem;
+    popup_separator: TMenuItem;
+    popup_import: TMenuItem;
+    popup_export: TMenuItem;
+    importd: TOpenDialog;
+    exportd: TSaveDialog;
+    FilePages: TPageControl;
+    tab_files: TTabSheet;
     panel_extension: TPanel;
     label_sort2: TLabel;
@@ -26,15 +37,5 @@
     edit_filtername: TEdit;
     check_filtername: TCheckBox;
-    bevel_filelist: TBevel;
-    splitter_content: TSplitter;
-    panel_content: TPanel;
-    filepopup: TPopupMenu;
-    popup_separator2: TMenuItem;
-    popup_linkshere: TMenuItem;
-    popup_separator: TMenuItem;
-    popup_import: TMenuItem;
-    popup_export: TMenuItem;
-    importd: TOpenDialog;
-    exportd: TSaveDialog;
+    filelist: TListBox;
     procedure NewCon(ID: Integer);