diff --git a/.gitignore b/.gitignore
index f36d61b..a3511a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ lib/
 *.res
 *.lps
 *.t2v
+output/PNGS/
+output/FILES/
diff --git a/output/tim2view_linux_i386 b/output/tim2view_linux_i386
index 08232ab..8bfacc7 100644
Binary files a/output/tim2view_linux_i386 and b/output/tim2view_linux_i386 differ
diff --git a/output/tim2view_linux_x86_64 b/output/tim2view_linux_x86_64
index 685e59c..0e2df04 100644
Binary files a/output/tim2view_linux_x86_64 and b/output/tim2view_linux_x86_64 differ
diff --git a/output/tim2view_win32_i386.exe b/output/tim2view_win32_i386.exe
index 74a0bb4..872e662 100644
Binary files a/output/tim2view_win32_i386.exe and b/output/tim2view_win32_i386.exe differ
diff --git a/output/tim2view_win64_x86_64.exe b/output/tim2view_win64_x86_64.exe
index 5983b8e..d29b7f4 100644
Binary files a/output/tim2view_win64_x86_64.exe and b/output/tim2view_win64_x86_64.exe differ
diff --git a/tim2view.lpi b/tim2view.lpi
index 5066333..2a275d8 100644
--- a/tim2view.lpi
+++ b/tim2view.lpi
@@ -27,7 +27,7 @@
       <AutoIncrementBuild Value="True"/>
       <MajorVersionNr Value="1"/>
       <RevisionNr Value="90"/>
-      <BuildNr Value="56"/>
+      <BuildNr Value="61"/>
       <StringTable CompanyName="Lab 313" FileDescription="The best TIMs tool ever!:)" ProductVersion=""/>
     </VersionInfo>
     <BuildModes Count="6">
diff --git a/umain.lfm b/umain.lfm
index 42a0596..0eb5fc1 100644
--- a/umain.lfm
+++ b/umain.lfm
@@ -901,11 +901,12 @@ object frmMain: TfrmMain
       object N22: TMenuItem
         Caption = '-'
       end
-      object MenuItem2: TMenuItem
+      object mnExtractAllTimsAll: TMenuItem
         Action = actExtractTimsAll
       end
-      object MenuItem3: TMenuItem
+      object mnExtractAllPngsAll: TMenuItem
         Action = actExtractPngsAll
+        ShortCut = 24691
       end
     end
     object mnOptions: TMenuItem
diff --git a/umain.pas b/umain.pas
index d6af001..4938756 100644
--- a/umain.pas
+++ b/umain.pas
@@ -52,8 +52,8 @@ type
     dlgOpenFile: TOpenDialog;
     dlgSavePNG: TSavePictureDialog;
     dlgSaveFile: TSaveDialog;
-    MenuItem2: TMenuItem;
-    MenuItem3: TMenuItem;
+    mnExtractAllTimsAll: TMenuItem;
+    mnExtractAllPngsAll: TMenuItem;
     N22: TMenuItem;
     mnExtractAllPngs3: TMenuItem;
     mnExtractAllTims3: TMenuItem;
@@ -391,6 +391,9 @@ begin
   lblStatus.Caption := sStatusBarPngsExtracting;
 
   for J := 1 to ScanResults.Count do begin
+    cbbFiles.ItemIndex := J - 1;
+    actChangeFile.Execute;
+
     FName := ScanResults[J - 1].ScanFile;
     IsImage := ScanResults[J - 1].IsImage;
 
@@ -415,7 +418,7 @@ begin
       Tim2Png(TIM, cbbCLUT.ItemIndex, Image, cbbTranspMode.ItemIndex);
 
       Path := Path + FormatPngName(FName, I - 1, BIT_MODE, 0);
-      SaveImage(Path, Image, False);
+      SaveImage(Path, Image, TIMisIndexed(TIM));
       {$IFDEF Linux}FpChmod(Path, &777);{$IFEND}
       Image^.Free;
       Image^ := nil;
@@ -466,7 +469,7 @@ begin
     Tim2Png(TIM, cbbCLUT.ItemIndex, Image, cbbTranspMode.ItemIndex);
 
     Path := Path + FormatPngName(FName, I - 1, BIT_MODE, 0);
-    SaveImage(Path, Image, False);
+    SaveImage(Path, Image, TIMisIndexed(TIM));
     {$IFDEF Linux}FpChmod(Path, &777);{$IFEND}
     Image^.Free;
     Image^ := nil;
@@ -507,6 +510,9 @@ begin
   lblStatus.Caption := sStatusBarFilesExtracting;
 
   for J := 1 to ScanResults.Count do begin
+    cbbFiles.ItemIndex := J - 1;
+    actChangeFile.Execute;
+
     FName := ScanResults[J - 1].ScanFile;
     IsImage := ScanResults[J - 1].IsImage;