Index: oup/current/Global/RawList.pas
===================================================================
--- oup/current/Global/RawList.pas	(revision 225)
+++ oup/current/Global/RawList.pas	(revision 226)
@@ -30,5 +30,5 @@
 
 uses
-  Template, ConnectionManager, Access_OniArchive, Classes, SysUtils, Math;
+  ConnectionManager, Access_OniArchive, Classes, SysUtils, Math, _TemplateFile;
 
 
Index: oup/current/OniUnPacker.dpr
===================================================================
--- oup/current/OniUnPacker.dpr	(revision 225)
+++ oup/current/OniUnPacker.dpr	(revision 226)
@@ -14,5 +14,4 @@
   Main in 'Main.pas' {Form_Main},
   Settings in 'Settings.pas' {Form_Settings},
-  Template in 'Tools\Template.pas' {Form_ToolTemplate},
   OniImgClass in 'Global\OniImgClass.pas',
   Functions in 'Global\Functions.pas',
@@ -21,5 +20,4 @@
   Exporters in 'Global\Exporters.pas',
   ValueEdit in 'Helper\ValueEdit.pas' {Form_ValueEdit},
-  _TxmpReplace in 'Tools\_TxmpReplace.pas' {Form_TxmpReplace_},
   WhatLinksHere in 'Helper\WhatLinksHere.pas' {Form_WhatLinksHere},
   DatLinks in 'Global\DatLinks.pas',