Index: oup/current/Tools/BinEdit.pas
===================================================================
--- oup/current/Tools/BinEdit.pas	(revision 109)
+++ oup/current/Tools/BinEdit.pas	(revision 111)
@@ -34,6 +34,6 @@
     procedure LoadDat(_fileid: Integer);
     function Save: Boolean;
-    function GetValue(datatype: Word; offset: LongWord): String;
-    procedure SetNewValue(datatype: Word; offset: LongWord; Value: String);
+    function GetValue(datatype: Word; offset: Integer): String;
+    procedure SetNewValue(datatype: Word; offset: Integer; Value: String);
 
     procedure WriteStructureInfos;
@@ -179,5 +179,5 @@
 
 
-function TForm_BinEdit.GetValue(datatype: Word; offset: LongWord): String;
+function TForm_BinEdit.GetValue(datatype: Word; offset: Integer): String;
 var
   Data: TByteData;
@@ -274,5 +274,5 @@
 procedure TForm_BinEdit.WriteStructureInfos;
 var
-  i, j:    LongWord;
+  i, j:    Integer;
   pdata:   PNodeData;
   Data:    TNodeData;
@@ -376,5 +376,5 @@
   Data:  TByteData;
   str:   String;
-  Value: LongWord;
+  Value: Integer;
   floatformat: TFormatSettings;
 begin
@@ -489,5 +489,5 @@
 var
   mem:  TMemoryStream;
-  i:    LongWord;
+  i:    Integer;
 begin
   case MessageBox(Self.Handle, PChar('Save changes to file ' +
@@ -671,5 +671,5 @@
 var
   Name:  String;
-  Value: LongWord;
+  Value: Integer;
 begin
   Name := TMenuItem(Sender).Name;
@@ -856,5 +856,5 @@
 
 
-procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String);
+procedure TForm_BinEdit.SetNewValue(datatype: Word; offset: Integer; Value: String);
 var
   Data: TByteData;
@@ -923,5 +923,5 @@
 procedure TForm_BinEdit.value_viewerDblClick(Sender: TObject);
 var
-  offset:     LongWord;
+  offset:     Integer;
   datatype:   Word;
   objectname: String;
Index: oup/current/Tools/Extractor.pas
===================================================================
--- oup/current/Tools/Extractor.pas	(revision 109)
+++ oup/current/Tools/Extractor.pas	(revision 111)
@@ -70,8 +70,8 @@
 var
   begintime: Double;
-  files:     LongWord;
-  i, done:   LongWord;
+  files:     Integer;
+  i, done:   Integer;
   selonly:   Boolean;
-  fileid:    LongWord;
+  fileid:    Integer;
   filename:  String;
   path:      String;
Index: oup/current/Tools/Preview.pas
===================================================================
--- oup/current/Tools/Preview.pas	(revision 109)
+++ oup/current/Tools/Preview.pas	(revision 111)
@@ -138,6 +138,6 @@
 var
   loop_speed: Word;
-  linkcount: LongWord;
-  link: LongWord;
+  linkcount: Integer;
+  link: Integer;
   i:    Byte;
 begin
Index: oup/current/Tools/RawEdit.pas
===================================================================
--- oup/current/Tools/RawEdit.pas	(revision 109)
+++ oup/current/Tools/RawEdit.pas	(revision 111)
@@ -39,8 +39,8 @@
     procedure FormKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
 
-    function GetValue(datatype: Word; offset: LongWord): String;
+    function GetValue(datatype: Word; offset: Integer): String;
     procedure ClearValues;
     procedure WriteValues;
-    procedure SetNewValue(datatype: Word; offset: LongWord; Value: String);
+    procedure SetNewValue(datatype: Word; offset: Integer; Value: String);
 
     procedure value_viewerDblClick(Sender: TObject);
@@ -101,5 +101,5 @@
 procedure TForm_RawEdit.LoadRaw(raw_info: TRawDataInfo);
 var
-  i:    LongWord;
+  i:    Integer;
   mem: TMemoryStream;
 begin
@@ -154,5 +154,5 @@
 
 
-function TForm_RawEdit.GetValue(datatype: Word; offset: LongWord): String;
+function TForm_RawEdit.GetValue(datatype: Word; offset: Integer): String;
 var
   Data: TByteData;
@@ -228,5 +228,5 @@
   Data:  TByteData;
   str:   String;
-  Value: LongWord;
+  Value: Integer;
   floatformat: TFormatSettings;
 begin
@@ -340,5 +340,5 @@
 procedure TForm_RawEdit.FormCreate(Sender: TObject);
 var
-  i:     LongWord;
+  i:     Integer;
   exts: String;
 begin
@@ -388,5 +388,5 @@
 var
   mem:  TMemoryStream;
-  i:    LongWord;
+  i:    Integer;
 begin
   case MessageBox(Self.Handle, PChar('Save changes to .raw-part of file ' +
@@ -635,5 +635,5 @@
 //  i:     Byte;
   Name:  String;
-  Value: LongWord;
+  Value: Integer;
 begin
   Name := TMenuItem(Sender).Name;
@@ -694,5 +694,5 @@
 
 
-procedure TForm_RawEdit.SetNewValue(datatype: Word; offset: LongWord; Value: String);
+procedure TForm_RawEdit.SetNewValue(datatype: Word; offset: Integer; Value: String);
 var
   Data: TByteData;
@@ -761,5 +761,5 @@
 procedure TForm_RawEdit.value_viewerDblClick(Sender: TObject);
 var
-  offset:     LongWord;
+  offset:     Integer;
   datatype:   Word;
   objectname: String;
Index: oup/current/Tools/TxmpReplace.pas
===================================================================
--- oup/current/Tools/TxmpReplace.pas	(revision 109)
+++ oup/current/Tools/TxmpReplace.pas	(revision 111)
@@ -90,6 +90,6 @@
 procedure TForm_TxmpReplace.btn_replaceClick(Sender: TObject);
 var
-  newsize: LongWord;
-  old_rawaddr, new_rawaddr: LongWord;
+  newsize: Integer;
+  old_rawaddr, new_rawaddr: Integer;
   oldfading: Byte;
   datbyte: Word;