diff --git a/tim2view.lpi b/tim2view.lpi
index 1eced2f..0991418 100644
--- a/tim2view.lpi
+++ b/tim2view.lpi
@@ -110,7 +110,7 @@
     <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
-      <Filename Value="tim2view"/>
+      <Filename Value="output\tim2view_$(TargetOS)_$(TargetCPU)"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);bgrabitmap"/>
@@ -118,7 +118,18 @@
       <OtherUnitFiles Value="bgrabitmap"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
+    <CodeGeneration>
+      <SmartLinkUnit Value="True"/>
+      <RelocatableUnit Value="True"/>
+      <Optimizations>
+        <OptimizationLevel Value="3"/>
+      </Optimizations>
+    </CodeGeneration>
     <Linking>
+      <Debugging>
+        <GenerateDebugInfo Value="False"/>
+      </Debugging>
+      <LinkSmart Value="True"/>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>
diff --git a/tim2view.lps b/tim2view.lps
index 8a75eb9..6629cd4 100644
--- a/tim2view.lps
+++ b/tim2view.lps
@@ -12,7 +12,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="37" Y="11"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="48"/>
       </Unit0>
       <Unit1>
         <Filename Value="umain.pas"/>
@@ -23,9 +23,9 @@
         <UnitName Value="umain"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="940"/>
-        <CursorPos X="85" Y="952"/>
-        <UsageCount Value="47"/>
+        <TopLine Value="10"/>
+        <CursorPos X="91" Y="29"/>
+        <UsageCount Value="48"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit1>
@@ -36,7 +36,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="42"/>
         <CursorPos X="88" Y="20"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="48"/>
       </Unit2>
       <Unit3>
         <Filename Value="ecc.pas"/>
@@ -45,7 +45,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="6" Y="11"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="48"/>
       </Unit3>
       <Unit4>
         <Filename Value="ucommon.pas"/>
@@ -55,8 +55,8 @@
         <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
-        <CursorPos X="35" Y="6"/>
-        <UsageCount Value="47"/>
+        <CursorPos X="79" Y="18"/>
+        <UsageCount Value="48"/>
         <Loaded Value="True"/>
       </Unit4>
       <Unit5>
@@ -67,7 +67,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="442"/>
         <CursorPos X="3" Y="456"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="48"/>
         <Loaded Value="True"/>
       </Unit5>
       <Unit6>
@@ -78,7 +78,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="70"/>
         <CursorPos X="65" Y="78"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="48"/>
         <Loaded Value="True"/>
       </Unit6>
       <Unit7>
@@ -88,7 +88,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="52"/>
         <CursorPos X="87" Y="71"/>
-        <UsageCount Value="47"/>
+        <UsageCount Value="48"/>
       </Unit7>
       <Unit8>
         <Filename Value="uscanresult.pas"/>
@@ -97,7 +97,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="26"/>
         <CursorPos X="1" Y="66"/>
-        <UsageCount Value="46"/>
+        <UsageCount Value="47"/>
       </Unit8>
       <Unit9>
         <Filename Value="uscanthread.pas"/>
@@ -107,7 +107,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="78" Y="20"/>
-        <UsageCount Value="46"/>
+        <UsageCount Value="47"/>
         <Loaded Value="True"/>
       </Unit9>
       <Unit10>
@@ -118,7 +118,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="1"/>
         <CursorPos X="23" Y="8"/>
-        <UsageCount Value="45"/>
+        <UsageCount Value="46"/>
         <Loaded Value="True"/>
       </Unit10>
       <Unit11>
@@ -129,7 +129,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="110"/>
         <CursorPos X="1" Y="127"/>
-        <UsageCount Value="32"/>
+        <UsageCount Value="33"/>
         <Loaded Value="True"/>
       </Unit11>
       <Unit12>
@@ -139,7 +139,7 @@
         <WindowIndex Value="0"/>
         <TopLine Value="55"/>
         <CursorPos X="3" Y="69"/>
-        <UsageCount Value="22"/>
+        <UsageCount Value="23"/>
       </Unit12>
       <Unit13>
         <Filename Value="l2sq_table.pas"/>
@@ -366,123 +366,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="umain.pas"/>
-        <Caret Line="390" Column="1" TopLine="373"/>
+        <Caret Line="394" Column="1" TopLine="377"/>
       </Position1>
       <Position2>
         <Filename Value="umain.pas"/>
-        <Caret Line="391" Column="1" TopLine="373"/>
+        <Caret Line="395" Column="1" TopLine="377"/>
       </Position2>
       <Position3>
         <Filename Value="umain.pas"/>
-        <Caret Line="393" Column="1" TopLine="377"/>
+        <Caret Line="396" Column="1" TopLine="377"/>
       </Position3>
       <Position4>
         <Filename Value="umain.pas"/>
-        <Caret Line="394" Column="1" TopLine="377"/>
+        <Caret Line="398" Column="1" TopLine="383"/>
       </Position4>
       <Position5>
         <Filename Value="umain.pas"/>
-        <Caret Line="395" Column="1" TopLine="377"/>
+        <Caret Line="399" Column="1" TopLine="383"/>
       </Position5>
       <Position6>
         <Filename Value="umain.pas"/>
-        <Caret Line="396" Column="1" TopLine="377"/>
+        <Caret Line="400" Column="1" TopLine="383"/>
       </Position6>
       <Position7>
         <Filename Value="umain.pas"/>
-        <Caret Line="398" Column="1" TopLine="383"/>
+        <Caret Line="401" Column="1" TopLine="383"/>
       </Position7>
       <Position8>
         <Filename Value="umain.pas"/>
-        <Caret Line="399" Column="1" TopLine="383"/>
+        <Caret Line="403" Column="75" TopLine="383"/>
       </Position8>
       <Position9>
         <Filename Value="umain.pas"/>
-        <Caret Line="400" Column="1" TopLine="383"/>
+        <Caret Line="404" Column="9" TopLine="383"/>
       </Position9>
       <Position10>
         <Filename Value="umain.pas"/>
-        <Caret Line="401" Column="1" TopLine="383"/>
+        <Caret Line="382" Column="1" TopLine="367"/>
       </Position10>
       <Position11>
         <Filename Value="umain.pas"/>
-        <Caret Line="403" Column="75" TopLine="383"/>
+        <Caret Line="404" Column="1" TopLine="391"/>
       </Position11>
       <Position12>
-        <Filename Value="umain.pas"/>
-        <Caret Line="404" Column="9" TopLine="383"/>
+        <Filename Value="udrawtim.pas"/>
+        <Caret Line="122" Column="1" TopLine="107"/>
       </Position12>
       <Position13>
-        <Filename Value="umain.pas"/>
-        <Caret Line="382" Column="1" TopLine="367"/>
+        <Filename Value="udrawtim.pas"/>
+        <Caret Line="123" Column="1" TopLine="107"/>
       </Position13>
       <Position14>
         <Filename Value="umain.pas"/>
-        <Caret Line="404" Column="1" TopLine="391"/>
+        <Caret Line="404" Column="1" TopLine="385"/>
       </Position14>
       <Position15>
         <Filename Value="udrawtim.pas"/>
-        <Caret Line="122" Column="1" TopLine="107"/>
+        <Caret Line="125" Column="1" TopLine="110"/>
       </Position15>
       <Position16>
         <Filename Value="udrawtim.pas"/>
-        <Caret Line="123" Column="1" TopLine="107"/>
+        <Caret Line="127" Column="1" TopLine="110"/>
       </Position16>
       <Position17>
         <Filename Value="umain.pas"/>
-        <Caret Line="404" Column="1" TopLine="385"/>
+        <Caret Line="396" Column="73" TopLine="385"/>
       </Position17>
       <Position18>
-        <Filename Value="udrawtim.pas"/>
-        <Caret Line="125" Column="1" TopLine="110"/>
+        <Filename Value="umain.pas"/>
+        <Caret Line="404" Column="1" TopLine="385"/>
       </Position18>
       <Position19>
         <Filename Value="udrawtim.pas"/>
-        <Caret Line="127" Column="1" TopLine="110"/>
+        <Caret Line="122" Column="1" TopLine="110"/>
       </Position19>
       <Position20>
-        <Filename Value="umain.pas"/>
-        <Caret Line="396" Column="73" TopLine="385"/>
+        <Filename Value="udrawtim.pas"/>
+        <Caret Line="123" Column="1" TopLine="110"/>
       </Position20>
       <Position21>
         <Filename Value="umain.pas"/>
-        <Caret Line="404" Column="1" TopLine="385"/>
+        <Caret Line="388" Column="17" TopLine="385"/>
       </Position21>
       <Position22>
-        <Filename Value="udrawtim.pas"/>
-        <Caret Line="122" Column="1" TopLine="110"/>
+        <Filename Value="umain.pas"/>
+        <Caret Line="405" Column="1" TopLine="385"/>
       </Position22>
       <Position23>
         <Filename Value="udrawtim.pas"/>
-        <Caret Line="123" Column="1" TopLine="110"/>
+        <Caret Line="122" Column="1" TopLine="110"/>
       </Position23>
       <Position24>
-        <Filename Value="umain.pas"/>
-        <Caret Line="388" Column="17" TopLine="385"/>
+        <Filename Value="udrawtim.pas"/>
+        <Caret Line="123" Column="1" TopLine="110"/>
       </Position24>
       <Position25>
-        <Filename Value="umain.pas"/>
-        <Caret Line="405" Column="1" TopLine="385"/>
+        <Filename Value="udrawtim.pas"/>
+        <Caret Line="125" Column="1" TopLine="110"/>
       </Position25>
       <Position26>
         <Filename Value="udrawtim.pas"/>
-        <Caret Line="122" Column="1" TopLine="110"/>
+        <Caret Line="127" Column="1" TopLine="110"/>
       </Position26>
       <Position27>
-        <Filename Value="udrawtim.pas"/>
-        <Caret Line="123" Column="1" TopLine="110"/>
+        <Filename Value="umain.pas"/>
+        <Caret Line="394" Column="94" TopLine="385"/>
       </Position27>
       <Position28>
-        <Filename Value="udrawtim.pas"/>
-        <Caret Line="125" Column="1" TopLine="110"/>
+        <Filename Value="umain.pas"/>
+        <Caret Line="949" Column="91" TopLine="941"/>
       </Position28>
       <Position29>
-        <Filename Value="udrawtim.pas"/>
-        <Caret Line="127" Column="1" TopLine="110"/>
+        <Filename Value="umain.pas"/>
+        <Caret Line="954" Column="54" TopLine="940"/>
       </Position29>
       <Position30>
         <Filename Value="umain.pas"/>
-        <Caret Line="394" Column="94" TopLine="385"/>
+        <Caret Line="960" Column="54" TopLine="940"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>
diff --git a/ucommon.pas b/ucommon.pas
index 26f4424..6325df1 100644
--- a/ucommon.pas
+++ b/ucommon.pas
@@ -3,7 +3,7 @@ unit ucommon;
 interface
 
 const
-  cProgramName = 'Tim2View SVN.r62 by [Lab 313] (for ' +
+  cProgramName = 'Tim2View SVN.r63 by [Lab 313] (for ' +
   {$IFDEF Linux}'Linux' + {$IFEND}
   {$IFDEF Darwin}'Mac OS X' + {$IFEND}
   {$IFDEF Windows}'Windows' + {$IFEND}
@@ -29,6 +29,7 @@ type
   TBytesArray = array [0 .. cMaxFileSize - 1] of byte;
   PBytesArray = ^TBytesArray;
 
+function ExtractJustName(const Path: string): string;
 function Min(A, B: Integer): Integer;
 function Max(A, B: Integer): Integer;
 
@@ -52,4 +53,10 @@ begin
     Result := B;
 end;
 
+function ExtractJustName(const Path: string): string;
+begin
+  Result := ExtractFileName(Path);
+  Result := Copy(Result, 1, Length(Result) - Length(ExtractFileExt(Result)));
+end;
+
 end.
diff --git a/umain.pas b/umain.pas
index 6606dde..fe2b59b 100644
--- a/umain.pas
+++ b/umain.pas
@@ -951,13 +951,13 @@ end;
 function TfrmMain.FormatTimName(const FileName: string; ListIdx_,
   BitMode: Integer): string;
 begin
-  Result := Format(cAutoExtractionTimFormat, [ExtractFileNameWithoutExt(FileName), ListIdx_ + 1, BitMode]);
+  Result := Format(cAutoExtractionTimFormat, [ExtractJustName(FileName), ListIdx_ + 1, BitMode]);
 end;
 
 function TfrmMain.FormatPngName(const FileName: string; ListIdx_, BitMode,
   Clut: Integer): string;
 begin
-  Result := Format(cAutoExtractionPngFormat, [ExtractFileNameWithoutExt(FileName), ListIdx_ + 1, BitMode, Clut + 1]);
+  Result := Format(cAutoExtractionPngFormat, [ExtractJustName(FileName), ListIdx_ + 1, BitMode, Clut + 1]);
 end;
 
 procedure TfrmMain.ShowTim;