Index: oup/current/Main.pas
===================================================================
--- oup/current/Main.pas	(revision 223)
+++ oup/current/Main.pas	(revision 224)
@@ -739,10 +739,10 @@
   end;
 const
-  Tools: array[0..4] of TTool = (
+  Tools: array[0..5] of TTool = (
     (name: 'binedit';     icon: 5; caption: 'Binary .dat-Editor'; classt: TForm_BinEdit),
     (name: 'extractor';   icon: 8; caption: 'Extractor';          classt: TForm_Extractor),
     (name: 'preview';     icon: 4; caption: 'Preview-Window';     classt: TForm_Preview),
     (name: 'rawedit';     icon: 6; caption: 'Binary .raw-Editor'; classt: TForm_RawEdit),
-//    (name: 'txmpreplace'; icon: 7; caption: 'TXMP Replacer';      classt: TForm_TxmpReplace),
+    (name: 'txmpreplace'; icon: 7; caption: 'TXMP Replacer';      classt: TForm_TxmpReplace),
     (name: 'meta'; icon: 11; caption: 'MetaEditor'; classt: TForm_Meta)
   );
Index: oup/current/OniUnPacker.bdsproj
===================================================================
--- oup/current/OniUnPacker.bdsproj	(revision 223)
+++ oup/current/OniUnPacker.bdsproj	(revision 224)
@@ -176,9 +176,5 @@
 			<Language Name="ProjectLang">$00000000</Language>
 			<Language Name="RootDir"></Language>
-		</Language>  
-    
-    
-    
-    <Excluded_Packages>
+		</Language>  <Excluded_Packages>
       <Excluded_Packages Name="d:\programme\borland\bds\3.0\Bin\dbwebxprt.bpl">Borland Web Wizard Package</Excluded_Packages>
     </Excluded_Packages>
Index: oup/current/OniUnPacker.dpr
===================================================================
--- oup/current/OniUnPacker.dpr	(revision 223)
+++ oup/current/OniUnPacker.dpr	(revision 224)
@@ -21,5 +21,5 @@
   Exporters in 'Global\Exporters.pas',
   ValueEdit in 'Helper\ValueEdit.pas' {Form_ValueEdit},
-  TxmpReplace in 'Tools\TxmpReplace.pas' {Form_TxmpReplace},
+  _TxmpReplace in 'Tools\_TxmpReplace.pas' {Form_TxmpReplace_},
   WhatLinksHere in 'Helper\WhatLinksHere.pas' {Form_WhatLinksHere},
   DatLinks in 'Global\DatLinks.pas',
@@ -150,5 +150,6 @@
   Extractor in 'Tools\Extractor.pas' {Form_Extractor},
   Preview in 'Tools\Preview.pas' {Form_Preview},
-  RawEdit in 'Tools\RawEdit.pas' {Form_RawEdit};
+  RawEdit in 'Tools\RawEdit.pas' {Form_RawEdit},
+  TxmpReplace in 'Tools\TxmpReplace.pas' {Form_TxmpReplace};
 
 {$R *.res}
Index: oup/current/Tools/Extractor.dfm
===================================================================
--- oup/current/Tools/Extractor.dfm	(revision 223)
+++ oup/current/Tools/Extractor.dfm	(revision 224)
@@ -16,7 +16,4 @@
       inherited panel_extension: TPanel
         Width = 300
-        inherited bevel_filelist: TBevel
-          Width = 299
-        end
         inherited combo_extension: TComboBox
           Width = 296
Index: oup/current/Tools/TxmpReplace.dfm
===================================================================
--- oup/current/Tools/TxmpReplace.dfm	(revision 223)
+++ oup/current/Tools/TxmpReplace.dfm	(revision 224)
@@ -1,160 +1,179 @@
 inherited Form_TxmpReplace: TForm_TxmpReplace
-  Caption = 'TxmpReplace'
+  Caption = 'Form_TxmpReplace'
+  ClientHeight = 573
   OnCreate = FormCreate
-  ExplicitWidth = 500
-  ExplicitHeight = 450
+  ExplicitHeight = 600
   PixelsPerInch = 96
   TextHeight = 13
-  inherited Splitter1: TSplitter
-    Height = 344
-    OnMoved = Splitter1Moved
-    ExplicitHeight = 344
-  end
-  inherited panel_files: TPanel
-    Height = 344
-    ExplicitHeight = 344
-    object image_txmppreview: TImage [0]
-      Left = 0
-      Top = 307
-      Width = 200
-      Height = 7
-      Align = alClient
-      ExplicitTop = 111
-      ExplicitHeight = 211
+  inherited panel_basecontent: TPanel
+    Height = 548
+    inherited splitter_content: TSplitter
+      Height = 548
+      OnMoved = Splitter1Moved
     end
-    object splitter_txmp: TSplitter [1]
-      Left = 0
-      Top = 299
-      Width = 200
-      Height = 8
-      Cursor = crVSplit
-      Align = alTop
-      AutoSnap = False
-      Beveled = True
-      MinSize = 60
-      ExplicitLeft = -6
-      ExplicitTop = 314
-    end
-    inherited filelist: TListBox
-      Height = 146
-      Align = alTop
-      ExplicitHeight = 146
-    end
-    inherited panel_extension: TPanel
-      inherited label_ext: TLabel
-        Visible = False
-      end
-      inherited combo_extension: TComboBox
-        Visible = False
-      end
-      inherited check_zerobyte: TCheckBox
-        Visible = False
+    inherited panel_files: TPanel
+      Height = 548
+      inherited FilePages: TPageControl
+        Height = 547
+        Constraints.MinHeight = 250
+        ExplicitHeight = 280
+        inherited tab_files: TTabSheet
+          inherited panel_extension: TPanel
+            inherited edit_filtername: TEdit
+              ExplicitWidth = 189
+            end
+          end
+          inherited filelist: TListBox
+            Height = 394
+          end
+        end
+        inherited tab_meta: TTabSheet
+          ExplicitLeft = 4
+          ExplicitTop = 24
+          ExplicitWidth = 190
+          ExplicitHeight = 424
+        end
       end
     end
-    object panel_txmppreview: TPanel
-      Left = 0
-      Top = 314
-      Width = 200
-      Height = 30
-      Align = alBottom
-      BevelOuter = bvNone
-      TabOrder = 2
-      object btn_save: TButton
-        Left = 2
-        Top = 2
-        Width = 111
-        Height = 25
-        Caption = 'Save TXMP-Picture'
+    inherited panel_content: TPanel
+      Height = 548
+      object Splitter1: TSplitter
+        Left = 0
+        Top = 220
+        Width = 390
+        Height = 8
+        Cursor = crVSplit
+        Align = alTop
+        AutoSnap = False
+        Beveled = True
+        MinSize = 75
+        OnMoved = Splitter1Moved
+        ExplicitTop = 105
+      end
+      object group_options: TGroupBox
+        Left = 0
+        Top = 469
+        Width = 390
+        Height = 79
+        Align = alBottom
+        Caption = '3. Options && Replace'
+        Enabled = False
         TabOrder = 0
-        OnClick = btn_saveClick
+        ExplicitTop = 441
+        ExplicitWidth = 492
+        object btn_replace: TButton
+          Left = 4
+          Top = 50
+          Width = 157
+          Height = 25
+          Caption = 'Replace'
+          TabOrder = 0
+          OnClick = btn_replaceClick
+        end
+        object check_transparency: TCheckBox
+          Left = 8
+          Top = 16
+          Width = 105
+          Height = 17
+          Caption = 'Transparency'
+          Enabled = False
+          TabOrder = 1
+        end
+        object check_fading: TCheckBox
+          Left = 8
+          Top = 32
+          Width = 105
+          Height = 17
+          Caption = 'MIP Mapping'
+          TabOrder = 2
+        end
       end
-    end
-  end
-  inherited content: TPanel
-    Height = 344
-    ExplicitHeight = 344
-    object group_bmpselect: TGroupBox
-      Left = 0
-      Top = 0
-      Width = 283
-      Height = 344
-      Align = alClient
-      Caption = '2. Open BMP to replace with'
-      Enabled = False
-      TabOrder = 0
-      object image_bmppreview: TImage
-        AlignWithMargins = True
-        Left = 5
-        Top = 48
-        Width = 273
-        Height = 291
+      object GroupBox1: TGroupBox
+        Left = 0
+        Top = 0
+        Width = 390
+        Height = 220
+        Align = alTop
+        Caption = '1. Select a TXMP to be replaced'
+        TabOrder = 1
+        object image_txmppreview: TImage
+          Left = 2
+          Top = 15
+          Width = 386
+          Height = 173
+          Align = alClient
+          ExplicitLeft = 0
+          ExplicitTop = 111
+          ExplicitWidth = 200
+          ExplicitHeight = 211
+        end
+        object panel_txmppreview: TPanel
+          Left = 2
+          Top = 188
+          Width = 386
+          Height = 30
+          Align = alBottom
+          BevelOuter = bvNone
+          TabOrder = 0
+          ExplicitLeft = 0
+          ExplicitTop = 411
+          ExplicitWidth = 200
+          object btn_save: TButton
+            Left = 2
+            Top = 2
+            Width = 121
+            Height = 25
+            Caption = 'Save TXMP-Picture ...'
+            TabOrder = 0
+            OnClick = btn_saveClick
+          end
+        end
+      end
+      object group_bmpselect: TGroupBox
+        Left = 0
+        Top = 228
+        Width = 390
+        Height = 241
         Align = alClient
-        ExplicitLeft = 2
-        ExplicitTop = 45
-        ExplicitWidth = 182
-        ExplicitHeight = 302
-      end
-      object panel_load: TPanel
-        Left = 2
-        Top = 15
-        Width = 279
-        Height = 30
-        Align = alTop
-        BevelOuter = bvNone
-        TabOrder = 0
-        object btn_load: TButton
+        Caption = '2. Open BMP to replace with'
+        Enabled = False
+        TabOrder = 2
+        ExplicitTop = 0
+        ExplicitWidth = 283
+        ExplicitHeight = 441
+        object image_bmppreview: TImage
+          AlignWithMargins = True
+          Left = 5
+          Top = 48
+          Width = 380
+          Height = 188
+          Align = alClient
+          ExplicitLeft = 2
+          ExplicitTop = 45
+          ExplicitWidth = 182
+          ExplicitHeight = 302
+        end
+        object panel_load: TPanel
           Left = 2
-          Top = 2
-          Width = 121
-          Height = 25
-          Caption = 'Load image...'
+          Top = 15
+          Width = 386
+          Height = 30
+          Align = alTop
+          BevelOuter = bvNone
           TabOrder = 0
-          OnClick = btn_loadClick
+          object btn_load: TButton
+            Left = 2
+            Top = 2
+            Width = 121
+            Height = 25
+            Caption = 'Load image...'
+            TabOrder = 0
+            OnClick = btn_loadClick
+          end
         end
       end
     end
   end
-  object group_options: TGroupBox [3]
-    Left = 0
-    Top = 344
-    Width = 492
-    Height = 79
-    Align = alBottom
-    Caption = '3. Options && Replace'
-    Enabled = False
-    TabOrder = 2
-    object btn_replace: TButton
-      Left = 4
-      Top = 50
-      Width = 157
-      Height = 25
-      Caption = 'Replace'
-      TabOrder = 0
-      OnClick = btn_replaceClick
-    end
-    object check_transparency: TCheckBox
-      Left = 8
-      Top = 16
-      Width = 105
-      Height = 17
-      Caption = 'Transparency'
-      Enabled = False
-      TabOrder = 1
-    end
-    object check_fading: TCheckBox
-      Left = 8
-      Top = 32
-      Width = 105
-      Height = 17
-      Caption = 'MIP Mapping'
-      TabOrder = 2
-    end
-  end
-  object opend: TOpenDialog [4]
-    Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing]
-    Left = 352
-    Top = 16
-  end
-  object saved: TSaveDialog [5]
+  object saved: TSaveDialog
     DefaultExt = 'bmp'
     Filter = 
@@ -164,6 +183,11 @@
       'pg, *.jpeg)|*.jpg;*.jpeg|PNG (*.png)|*.png|All files (*.*)|*'
     Options = [ofOverwritePrompt, ofHideReadOnly, ofPathMustExist, ofEnableSizing]
-    Left = 104
-    Top = 320
+    Left = 352
+    Top = 212
+  end
+  object opend: TOpenDialog
+    Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing]
+    Left = 352
+    Top = 264
   end
 end
Index: oup/current/Tools/TxmpReplace.pas
===================================================================
--- oup/current/Tools/TxmpReplace.pas	(revision 223)
+++ oup/current/Tools/TxmpReplace.pas	(revision 224)
@@ -1,25 +1,28 @@
 unit TxmpReplace;
+
 interface
+
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, Template, StdCtrls, ExtCtrls,
-  Functions, Data, OniImgClass, Menus, Buttons, TypeDefs;
+  Dialogs, _TemplateFileList, Menus, StdCtrls, Buttons, ComCtrls, ExtCtrls,
+  OniImgClass, TypeDefs;
 
 type
-  TForm_TxmpReplace = class(TForm_ToolTemplate)
+  TForm_TxmpReplace = class(TForm_TemplateFileList)
     group_options: TGroupBox;
     btn_replace: TButton;
     check_transparency: TCheckBox;
     check_fading: TCheckBox;
-    panel_txmppreview: TPanel;
-    btn_save: TButton;
-    image_txmppreview: TImage;
-    splitter_txmp: TSplitter;
+    GroupBox1: TGroupBox;
+    Splitter1: TSplitter;
     group_bmpselect: TGroupBox;
     image_bmppreview: TImage;
     panel_load: TPanel;
     btn_load: TButton;
+    image_txmppreview: TImage;
+    panel_txmppreview: TPanel;
+    btn_save: TButton;
+    saved: TSaveDialog;
     opend: TOpenDialog;
-    saved: TSaveDialog;
     procedure SelectFile(fileinfo: TFileInfo);
     procedure FormCreate(Sender: TObject);
@@ -37,12 +40,8 @@
   end;
 
-var
-  Form_TxmpReplace: TForm_TxmpReplace;
-
 implementation
 {$R *.dfm}
-uses Main, ConnectionManager, ImagingTypes, TXMP;
-
-
+uses
+  _TemplateFile, ConnectionManager, ImagingTypes;
 
 procedure TForm_TxmpReplace.SelectFile(fileinfo: TFileInfo);
@@ -246,2 +245,3 @@
   AddToolListEntry('txmpreplace', 'TXMP Replacer', 'TXMP');
 end.
+
