Merge branch 'pr/48'

Refactor + Add Apktool version checks
Merge branch 'pr/49'
2026-05-04 11:02:27 +00:00 · 2026-05-03 13:17:37 +02:00 · 2026-05-03 11:56:56 +02:00 · 2026-04-28 17:56:14 +02:00 · 2026-03-05 20:56:43 +09:00 · 2026-03-05 20:37:17 +09:00
66 changed files with 6255 additions and 4313 deletions
@@ -11,16 +11,10 @@ body:
          required: true
        - label: I performed a cursory search of the issue tracker on [APK Tool GUI](https://github.com/AndnixSH/APKToolGUI/issues?q=is%3Aissue) to avoid opening a duplicate issue
          required: true
-        - label: I performed a cursory search of the issue tracker on [Apktool] (https://github.com/iBotPeaches/Apktool/issues?q=is%3Aissue) and [Baksmali](https://github.com/JesusFreke/smali/issues?q=is%3Aissue) but did not found an answer
-          required: true
-        - label: I am running the latest version of [APK Tool GUI](https://github.com/AndnixSH/APKToolGUI/releases) and [Apktool.jar](https://github.com/iBotPeaches/Apktool/releases).
-          required: true
-        - label: I have tried to decompile and compile without changing anything.
+        - label: I am running the latest version of [APK Tool GUI](https://github.com/AndnixSH/APKToolGUI/releases).
          required: true
        - label: I have read the [FAQ](https://github.com/AndnixSH/APKToolGUI#faq)
          required: true
-        - label: I have checked using [APKiD](https://github.com/rednaga/APKiD) and verified that the app does not have protection(s) like packer, obfuscation, anti-tamper, anti-cheats etc
-          required: false

  - type: textarea
    attributes:
@@ -3,21 +3,15 @@ contact_links:
  - name: Apktool Issues List
    url: https://github.com/iBotPeaches/Apktool/issues?q=is%3Aissue
    about: Check Apktool issues before reporting issue here. Your issue might already exists
-  - name: Baksmali Issues List
-    url: https://github.com/JesusFreke/smali/issues?q=is%3Aissue
-    about: Check Baksmali issues before reporting issue here. Your issue might already exists
-  - name: System apps modding support forum
-    url: https://forum.xda-developers.com/all-forums-by-manufacturer
-    about: For support, questions or help with modding system apps.
  - name: Apktool forum
    url: https://github.com/iBotPeaches/Apktool/discussions
    about: For support, questions or help with Apktool, development and modding
+  - name: Smali Issues List
+    url: https://github.com/JesusFreke/smali/issues?q=is%3Aissue
+    about: Check Baksmali issues before reporting issue here. Your issue might already exists
+  - name: Smali Issues List 2
+    url: https://github.com/google/smali/issues?q=is%3Aissue
+    about: Check Baksmali issues before reporting issue here. Your issue might already exists
  - name: Android development and modding support forum
    url: https://forum.xda-developers.com/c/android-development-and-hacking.564/
-    about: For support, questions or help with development and modding
-  - name: Android development and modding support forum 2
-    url: https://androidforums.com/forums/android-development.28/
-    about: For support, questions or help with development and modding
-  - name: Android development and modding support forum 3
-    url: https://platinmods.com/forums/modding-questions-discussions.11/
-    about: For support, questions or help with development and modding
+    about: For support, questions or help with development and modding'
@@ -0,0 +1,47 @@
+name: Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      name: Checkout Code
+
+    - name: Setup MSBuild Path
+      uses: microsoft/setup-msbuild@v1.3.1
+
+    - name: Setup NuGet
+      uses: NuGet/setup-nuget@v2
+
+    - name: Restore NuGet Packages
+      run: nuget restore APKToolGUI.sln
+
+    - name: Build Application
+      run: msbuild APKToolGUI.sln /p:Configuration=Release
+
+    - name: Create package directory
+      run: mkdir package
+
+    - name: Copy essential files to package
+      shell: pwsh
+      run: |
+        Copy-Item APKToolGUI/bin/Release/APKToolGUI.exe package/
+        Copy-Item changelog.txt package/Changelog.txt
+
+        if (Test-Path APKToolGUI/bin/Release/Resources) {
+          Copy-Item APKToolGUI/bin/Release/Resources package/ -Recurse
+        }
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: APKToolGUI
+        path: package/
@@ -124,11 +124,11 @@
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
    </Reference>
-    <Reference Include="System.Collections.Immutable, Version=9.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.9.0.3\lib\net462\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=9.0.0.10, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.9.0.10\lib\net462\System.Collections.Immutable.dll</HintPath>
    </Reference>
    <Reference Include="System.ComponentModel.Composition" />
    <Reference Include="System.configuration" />
@@ -140,8 +140,8 @@
    <Reference Include="System.Core" />
    <Reference Include="System.Data.OracleClient" />
    <Reference Include="System.Design" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.10, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.10\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
    </Reference>
    <Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
@@ -149,8 +149,8 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.DirectoryServices" />
-    <Reference Include="System.Formats.Nrbf, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Formats.Nrbf.9.0.3\lib\net462\System.Formats.Nrbf.dll</HintPath>
+    <Reference Include="System.Formats.Nrbf, Version=9.0.0.10, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Formats.Nrbf.9.0.10\lib\net462\System.Formats.Nrbf.dll</HintPath>
    </Reference>
    <Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
@@ -184,8 +184,8 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.1\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Net" />
    <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -199,27 +199,27 @@
      <Private>True</Private>
    </Reference>
    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
    </Reference>
    <Reference Include="System.Reflection, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll</HintPath>
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Reflection.Metadata, Version=9.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Reflection.Metadata.9.0.3\lib\net462\System.Reflection.Metadata.dll</HintPath>
+    <Reference Include="System.Reflection.Metadata, Version=9.0.0.10, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reflection.Metadata.9.0.10\lib\net462\System.Reflection.Metadata.dll</HintPath>
    </Reference>
-    <Reference Include="System.Resources.Extensions, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Resources.Extensions.9.0.3\lib\net462\System.Resources.Extensions.dll</HintPath>
+    <Reference Include="System.Resources.Extensions, Version=9.0.0.10, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Resources.Extensions.9.0.10\lib\net462\System.Resources.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
@@ -260,15 +260,15 @@
      <Private>True</Private>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Security.Permissions, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Security.Permissions.9.0.3\lib\net462\System.Security.Permissions.dll</HintPath>
+    <Reference Include="System.Security.Permissions, Version=9.0.0.10, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Permissions.9.0.10\lib\net462\System.Security.Permissions.dll</HintPath>
    </Reference>
    <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
    </Reference>
    <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Text.Encoding.CodePages, Version=9.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encoding.CodePages.9.0.3\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
+    <Reference Include="System.Text.Encoding.CodePages, Version=9.0.0.10, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encoding.CodePages.9.0.10\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
    </Reference>
    <Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
@@ -422,6 +422,7 @@
    <EmbeddedResource Include="Languages\Language.hu.resx" />
    <EmbeddedResource Include="Languages\Language.pt-BR.resx" />
    <EmbeddedResource Include="Languages\Language.ru.resx" />
+    <EmbeddedResource Include="Languages\Language.tr.resx" />
    <EmbeddedResource Include="Languages\Language.zh-CN.resx" />
    <EmbeddedResource Include="Languages\Language.vi-VN.resx" />
    <EmbeddedResource Include="Properties\Resources.resx">
@@ -453,7 +454,6 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="android-thin.ico" />
-    <Content Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
    <None Include="Resources\info.png" />
    <None Include="Resources\waiting.png" />
    <None Include="Resources\warning.png" />
@@ -497,7 +497,8 @@
    <Error Condition="!Exists('..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Resource.Embedder.2.2.0\build\Resource.Embedder.props'))" />
    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.props'))" />
    <Error Condition="!Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Fody.6.9.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.9.2\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Fody.6.9.3\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.9.3\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
  </Target>
  <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
  <PropertyGroup>
@@ -505,7 +506,6 @@
    </PostBuildEvent>
  </PropertyGroup>
  <Import Project="..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.6.0.0\build\Costura.Fody.targets')" />
-  <Import Project="..\packages\Fody.6.9.2\build\Fody.targets" Condition="Exists('..\packages\Fody.6.9.2\build\Fody.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
@@ -513,4 +513,6 @@
  <Target Name="AfterBuild">
  </Target>
  -->
+  <Import Project="..\packages\Fody.6.9.3\build\Fody.targets" Condition="Exists('..\packages\Fody.6.9.3\build\Fody.targets')" />
+  <Import Project="..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
 </Project>
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <PublishUrlHistory>publish\</PublishUrlHistory>
@@ -9,6 +9,7 @@
    <ErrorReportUrlHistory />
    <FallbackCulture>ru-RU</FallbackCulture>
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ShowAllFiles</ProjectView>
  </PropertyGroup>
  <PropertyGroup>
    <EnableSecurityDebugging>false</EnableSecurityDebugging>
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
 using System.Threading.Tasks;
@@ -101,31 +102,32 @@ namespace APKToolGUI.Utils

                List<string> nativecode = new List<string> { };
                List<string> nativecode2 = new List<string> { };
+                StringBuilder permissionsBuilder = new StringBuilder();
                foreach (string line in lines)
                {
                    switch (line.Split(':')[0])
                    {
                        case "package":
-                            PackageName = StringExt.Regex(@"(?<=package: name=\')(.*?)(?=\')", line);
-                            VersionName = StringExt.Regex(@"(?<=versionName=\')(.*?)(?=\')", line);
-                            VersionCode = StringExt.Regex(@"(?<=versionCode=\')(.*?)(?=\')", line);
+                            PackageName = StringExt.RegexExtract(@"(?<=package: name=\')(.*?)(?=\')", line);
+                            VersionName = StringExt.RegexExtract(@"(?<=versionName=\')(.*?)(?=\')", line);
+                            VersionCode = StringExt.RegexExtract(@"(?<=versionCode=\')(.*?)(?=\')", line);
                            break;
                        case "uses-permission":
-                            Permissions += StringExt.Regex(@"(?<=name=\')(.*?)(?=\')", line) + "\n";
+                            permissionsBuilder.AppendLine(StringExt.RegexExtract(@"(?<=name=\')(.*?)(?=\')", line));
                            break;
                        case "sdkVersion":
-                            MinSdkVersionDetailed = SdkToAndroidVer(StringExt.Regex(@"(?<=sdkVersion:\')(.*?)(?=\')", line));
-                            MinSdkVersion = StringExt.Regex(@"(?<=sdkVersion:\')(.*?)(?=\')", line);
+                            MinSdkVersionDetailed = SdkToAndroidVer(StringExt.RegexExtract(@"(?<=sdkVersion:\')(.*?)(?=\')", line));
+                            MinSdkVersion = StringExt.RegexExtract(@"(?<=sdkVersion:\')(.*?)(?=\')", line);
                            break;
                        case "targetSdkVersion":
-                            TargetSdkVersionDetailed = SdkToAndroidVer(StringExt.Regex(@"(?<=targetSdkVersion:\')(.*?)(?=\')", line));
-                            TargetSdkVersion = StringExt.Regex(@"(?<=targetSdkVersion:\')(.*?)(?=\')", line);
+                            TargetSdkVersionDetailed = SdkToAndroidVer(StringExt.RegexExtract(@"(?<=targetSdkVersion:\')(.*?)(?=\')", line));
+                            TargetSdkVersion = StringExt.RegexExtract(@"(?<=targetSdkVersion:\')(.*?)(?=\')", line);
                            break;
                        case "application-label":
-                            AppName = StringExt.Regex(@"(?<=application-label:\')(.*?)(?=\')", line);
+                            AppName = StringExt.RegexExtract(@"(?<=application-label:\')(.*?)(?=\')", line);
                            break;
                        case "launchable-activity":
-                            LaunchableActivity = StringExt.Regex(@"(?<=name=\')(.*?)(?=\')", line);
+                            LaunchableActivity = StringExt.RegexExtract(@"(?<=name=\')(.*?)(?=\')", line);
                            break;
                        case "supports-screens":
                            var screens = Regex.Matches(line.Split(':')[1], @"(?<= \')(.*?)(?=\')").Cast<Match>().Select(m => m.Value).ToList();
@@ -147,6 +149,8 @@ namespace APKToolGUI.Utils
                            break;
                    }
                }
+
+                Permissions = permissionsBuilder.ToString();
                List<string> combinedList = nativecode2.Concat(nativecode).ToList();
                NativeCode += string.Join(", ", combinedList);
                ApkFile = file;
@@ -157,13 +161,13 @@ namespace APKToolGUI.Utils
                ApkMirrorLink = "https://www.apkmirror.com/?post_type=app_release&searchtype=apk&s=" + PackageName;
                ApkGkLink = "https://apkgk.com/" + PackageName + "/download";

-                AppIcon120 = StringExt.Regex(@"(?<=application-icon-120:\')(.*?)(?=\')", FullInfo);
-                AppIcon160 = StringExt.Regex(@"(?<=application-icon-160:\')(.*?)(?=\')", FullInfo);
-                AppIcon240 = StringExt.Regex(@"(?<=application-icon-240:\')(.*?)(?=\')", FullInfo);
-                AppIcon320 = StringExt.Regex(@"(?<=application-icon-320:\')(.*?)(?=\')", FullInfo);
-                AppIcon480 = StringExt.Regex(@"(?<=application-icon-480:\')(.*?)(?=\')", FullInfo);
-                AppIcon640 = StringExt.Regex(@"(?<=application-icon-640:\')(.*?)(?=\')", FullInfo);
-                AppIcon65534 = StringExt.Regex(@"(?<=application-icon-65534:\')(.*?)(?=\')", FullInfo);
+                AppIcon120 = StringExt.RegexExtract(@"(?<=application-icon-120:\')(.*?)(?=\')", FullInfo);
+                AppIcon160 = StringExt.RegexExtract(@"(?<=application-icon-160:\')(.*?)(?=\')", FullInfo);
+                AppIcon240 = StringExt.RegexExtract(@"(?<=application-icon-240:\')(.*?)(?=\')", FullInfo);
+                AppIcon320 = StringExt.RegexExtract(@"(?<=application-icon-320:\')(.*?)(?=\')", FullInfo);
+                AppIcon480 = StringExt.RegexExtract(@"(?<=application-icon-480:\')(.*?)(?=\')", FullInfo);
+                AppIcon640 = StringExt.RegexExtract(@"(?<=application-icon-640:\')(.*?)(?=\')", FullInfo);
+                AppIcon65534 = StringExt.RegexExtract(@"(?<=application-icon-65534:\')(.*?)(?=\')", FullInfo);

                result = true;
            }
@@ -252,12 +256,21 @@ namespace APKToolGUI.Utils
                    //File.WriteAllText("R:\\t.txt", ps);
                    string icondl = Path.Combine(cacheDir, "icon.png");
                    Directory.CreateDirectory(cacheDir);
-                    w.DownloadFile(StringExt.Regex(@"(?<=\""image\"":\"")(.*?)(?=\"",\"")", ps), icondl);
+                    w.DownloadFile(StringExt.RegexExtract(@"(?<=\""image\"":\"")(.*?)(?=\"",\"")", ps), icondl);
                    iconLocation = icondl;
                }
-                catch
+                catch (System.Net.WebException ex)
                {
-                    
+                    Debug.WriteLine($"[AaptParser] Failed to download icon from web: {ex.Message}");
+                    // Icon download failure is not critical, use default value
+                }
+                catch (IOException ex)
+                {
+                    Debug.WriteLine($"[AaptParser] Failed to save icon file: {ex.Message}");
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"[AaptParser] Unexpected error getting icon: {ex.Message}");
                }
            }

@@ -269,6 +282,8 @@ namespace APKToolGUI.Utils
        {
            switch (sdk)
            {
+                case "36":
+                    return sdk + ": Android 16";
                case "35":
                    return sdk + ": Android 15";
                case "34":
@@ -10,9 +10,11 @@ using System.Windows.Shapes;

 namespace APKToolGUI
 {
-    public class Adb
+    public class Adb : IDisposable
    {
        Process processAdb;
+        private bool disposed = false;
+
        static class Keys
        {
            public const string Devices = " devices -l"; //list connected devices (-l for long output)
@@ -43,10 +45,10 @@ namespace APKToolGUI
            processAdb = new Process();
            processAdb.EnableRaisingEvents = true;
            processAdb.StartInfo.FileName = AdbFileName;
-            processAdb.StartInfo.UseShellExecute = false; //отключаем использование оболочки, чтобы можно было читать данные вывода
-            processAdb.StartInfo.RedirectStandardOutput = true; // разрешаем перенаправление данных вывода
-            processAdb.StartInfo.RedirectStandardError = true; // разрешаем перенаправление данных вывода
-            processAdb.StartInfo.CreateNoWindow = true; //запрещаем создавать окно для запускаемой программы
+            processAdb.StartInfo.UseShellExecute = false; // Disable shell execution to read output data
+            processAdb.StartInfo.RedirectStandardOutput = true; // Allow output redirection
+            processAdb.StartInfo.RedirectStandardError = true; // Allow error redirection
+            processAdb.StartInfo.CreateNoWindow = true; // Do not create window for the launched program
            processAdb.Exited += processAdb_Exited;
        }

@@ -64,14 +66,62 @@ namespace APKToolGUI
            {
                foreach (var process in Process.GetProcessesByName("adb"))
                {
-                    if (process.Id == processAdb.Id)
+                    using (process)
                    {
-                        ProcessUtils.KillAllProcessesSpawnedBy((uint)processAdb.Id);
-                        process.Kill();
+                        if (process.Id == processAdb.Id)
+                        {
+                            ProcessUtils.KillAllProcessesSpawnedBy((uint)processAdb.Id);
+                            process.Kill();
+                        }
                    }
                }
            }
-            catch { }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[Adb] Cancel failed: {ex.Message}");
+                // Process termination failure is not critical, so continue
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    if (processAdb != null)
+                    {
+                        try
+                        {
+                            if (!processAdb.HasExited)
+                            {
+                                processAdb.Kill();
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            Debug.WriteLine($"[Adb] Error disposing process: {ex.Message}");
+                        }
+                        finally
+                        {
+                            processAdb.Dispose();
+                            processAdb = null;
+                        }
+                    }
+                }
+                disposed = true;
+            }
+        }
+
+        ~Adb()
+        {
+            Dispose(false);
        }

        public int Install(string device, string inputApk)
@@ -120,26 +170,31 @@ namespace APKToolGUI
        {
            Log.d("ADB: " + adbFileName + " " + Keys.Devices);

-            Process process = new Process();
-            process.EnableRaisingEvents = true;
-            process.StartInfo.FileName = adbFileName;
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.RedirectStandardError = true;
-            process.StartInfo.CreateNoWindow = true;
-            process.EnableRaisingEvents = false;
-            process.StartInfo.Arguments = Keys.Devices;
-            process.Start();
-            string devices = process.StandardOutput.ReadToEnd();
-            process.WaitForExit();
-            return devices;
+            using (Process process = new Process())
+            {
+                process.EnableRaisingEvents = true;
+                process.StartInfo.FileName = adbFileName;
+                process.StartInfo.UseShellExecute = false;
+                process.StartInfo.RedirectStandardOutput = true;
+                process.StartInfo.RedirectStandardError = true;
+                process.StartInfo.CreateNoWindow = true;
+                process.EnableRaisingEvents = false;
+                process.StartInfo.Arguments = Keys.Devices;
+                process.Start();
+                string devices = process.StandardOutput.ReadToEnd();
+                process.WaitForExit();
+                return devices;
+            }
        }

        public void KillProcess()
        {
            foreach (var process in Process.GetProcessesByName("adb"))
            {
-                process.Kill();
+                using (process)
+                {
+                    process.Kill();
+                }
            }
        }
    }
@@ -8,8 +8,10 @@ using System.Windows.Forms;

 namespace APKToolGUI
 {
-    public class ApkEditor : JarProcess
+    public class ApkEditor : JarProcess, IDisposable
    {
+        private bool disposed = false;
+
        public new event ApkEditorExitedEventHandler Exited;

        string _jarPath;
@@ -72,14 +74,28 @@ namespace APKToolGUI
            {
                foreach (var process in Process.GetProcessesByName("java"))
                {
-                    if (process.Id == Id)
+                    using (process)
                    {
-                        ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
-                        process.Kill();
+                        if (process.Id == Id)
+                        {
+                            ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
+                            process.Kill();
+                        }
                    }
                }
            }
-            catch { }
+            catch (InvalidOperationException ex)
+            {
+                Debug.WriteLine($"[ApkEditor] Process already exited: {ex.Message}");
+            }
+            catch (System.ComponentModel.Win32Exception ex)
+            {
+                Debug.WriteLine($"[ApkEditor] Failed to access process: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[ApkEditor] Failed to cancel process: {ex.Message}");
+            }
        }

        public int Merge(string input, string output)
@@ -158,6 +174,40 @@ namespace APKToolGUI
                return version.Replace("\r\n", "");
            }
        }
+
+        public new void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected new virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    try
+                    {
+                        Cancel();
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"[ApkEditor] Error during disposal: {ex.Message}");
+                    }
+                    finally
+                    {
+                        base.Dispose();
+                    }
+                }
+                disposed = true;
+            }
+        }
+
+        ~ApkEditor()
+        {
+            Dispose(false);
+        }
    }

    public class ApkEditorExitedEventArgs : EventArgs
@@ -1,7 +1,9 @@

+
 using APKToolGUI.Utils;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -15,28 +17,49 @@ namespace APKToolGUI.ApkTool
        public static bool FixAndroidManifest(string decompilePath)
        {
            string manifestPath = Path.Combine(decompilePath, "AndroidManifest.xml");
-            if (File.Exists(manifestPath))
+            if (!File.Exists(manifestPath))
+                return false;
+
+            try
            {
-                string maniFestText = File.ReadAllText(manifestPath);
-                maniFestText = maniFestText.Replace("\\ ", "\\u003");
-                maniFestText = maniFestText.Replace("android:isSplitRequired=\"true\"", "");
-                maniFestText = maniFestText.Replace("android:extractNativeLibs=\"false\"", "");
-                maniFestText = maniFestText.Replace("android:useEmbeddedDex=\"true\"", "");
-                maniFestText = maniFestText.Replace("android:manageSpace=\"true\"", "");
-                maniFestText = maniFestText.Replace("android:localeConfig=\"@xml/locales_config\"", "");
-                maniFestText = maniFestText.Replace("STAMP_TYPE_DISTRIBUTION_APK", "STAMP_TYPE_STANDALONE_APK");
-
-                File.WriteAllText(manifestPath, maniFestText);
+                string manifestText = File.ReadAllText(manifestPath);
+                manifestText = manifestText.Replace("\\ ", "\\u003");
+                manifestText = manifestText.Replace("android:isSplitRequired=\"true\"", "");
+                manifestText = manifestText.Replace("android:extractNativeLibs=\"false\"", "");
+                manifestText = manifestText.Replace("android:useEmbeddedDex=\"true\"", "");
+                manifestText = manifestText.Replace("android:manageSpace=\"true\"", "");
+                manifestText = manifestText.Replace("android:localeConfig=\"@xml/locales_config\"", "");
+                manifestText = manifestText.Replace("STAMP_TYPE_DISTRIBUTION_APK", "STAMP_TYPE_STANDALONE_APK");
+                manifestText = Regex.Replace(manifestText, @"\s*android:requiredSplitTypes=""[^""]*""", "");
+                manifestText = Regex.Replace(manifestText, @"\s*android:splitTypes=""[^""]*""", "");

+                File.WriteAllText(manifestPath, manifestText);
                return true;
            }
-            return false;
+            catch (IOException ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Failed to fix AndroidManifest.xml: {ex.Message}");
+                return false;
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Access denied to AndroidManifest.xml: {ex.Message}");
+                return false;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Unexpected error fixing AndroidManifest.xml: {ex.Message}");
+                return false;
+            }
        }

        public static bool FixApktoolYml(string decompilePath)
        {
            string ymlPath = Path.Combine(decompilePath, "apktool.yml");
-            if (File.Exists(ymlPath))
+            if (!File.Exists(ymlPath))
+                return false;
+
+            try
            {
                string yml = File.ReadAllText(ymlPath);
                yml = yml.Replace("sparseResources: true", "sparseResources: false");
@@ -44,18 +67,49 @@ namespace APKToolGUI.ApkTool
                File.WriteAllText(ymlPath, yml);
                return true;
            }
-            return false;
+            catch (IOException ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Failed to fix apktool.yml: {ex.Message}");
+                return false;
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Access denied to apktool.yml: {ex.Message}");
+                return false;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Unexpected error fixing apktool.yml: {ex.Message}");
+                return false;
+            }
        }

        public static bool RemoveApkToolDummies(string path)
        {
            string resPath = Path.Combine(path, "res", "values");
-            if (Directory.Exists(resPath))
+            if (!Directory.Exists(resPath))
+                return false;
+
+            try
            {
                DirectoryUtils.ReplaceinFilesRegex(resPath, "(.*(?:APKTOOL_DUMMY).*)", "");
                return true;
            }
-            return false;
+            catch (IOException ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Failed to remove APKTOOL_DUMMY: {ex.Message}");
+                return false;
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Access denied while removing APKTOOL_DUMMY: {ex.Message}");
+                return false;
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Debug.WriteLine($"[ApkFixer] Unexpected error removing APKTOOL_DUMMY: {ex.Message}");
+                return false;
+            }
        }
    }
 }
@@ -11,56 +11,121 @@ using Java;

 namespace APKToolGUI
 {
-    public class Apktool : JarProcess
+    public class Apktool : JarProcess, IDisposable
    {
-        enum ApktoolActionType
+        private bool disposed = false;
+        private static readonly Regex ApktoolVersionRegex = new Regex(@"v?(?<version>\d+\.\d+\.\d+)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        public Version ParsedVersion { get; private set; }
+        public string Version { get; private set; }
+
+        public Apktool(string javaPath, string jarPath) : base(javaPath, jarPath)
        {
-            Decompile,
-            Build,
-            InstallFramework,
-            ClearFramework,
-            Null
+            Exited += Apktool_Exited;
+            OutputDataReceived += Apktool_OutputDataReceived;
+            ErrorDataReceived += Apktool_ErrorDataReceived;
+
+            string apktoolVersion = GetVersion();
+            string apktoolVersionOld = GetVersionOld();
+            if (!String.IsNullOrWhiteSpace(apktoolVersion) && !Regex.IsMatch(apktoolVersion, @"\r\n?|\n"))
+                Version = apktoolVersion;
+            else if (!String.IsNullOrWhiteSpace(apktoolVersionOld) && !Regex.IsMatch(apktoolVersionOld, @"\r\n?|\n"))
+                Version = apktoolVersionOld;
+
+            ParsedVersion = ParseVersion(Version);
+
+            Debug.WriteLine($"[Apktool] Parsed version: {ParsedVersion}");
        }

        static class DecompileKeys
        {
-            public const string NoSource = " -s"; //Do not decode sources.
-            public const string NoResource = " -r"; //Do not decode resources.
-            public const string NoDebugInfo = " -b"; //don't write out debug info (.local, .param, .line, etc.)
-            public const string Force = " -f"; //Skip changes detection and build all files.
-            public const string FrameworkPath = " -p"; //Uses framework files located in <dir>.
-            public const string KeepBrokenResource = " -k"; //Use if there was an error and some resources were dropped
-            public const string MatchOriginal = " -m"; //Keeps files to closest to original as possible. Prevents rebuild.
-            public const string OutputDir = " -o"; //The name of folder that gets written. Default is apk.out
-            public const string OnlyMainClasses = " -only-main-classes"; //Only disassemble the main dex classes (classes[0-9]*.dex) in the root.
-            public const string ApiLevel = " -api"; //The numeric api-level of the file to generate, e.g. 14 for ICS.
-            public const string Jobs = " -j"; // Sets the number of threads to use.
+            //Do not decode sources.
+            public const string NoSource = " -s";
+
+            //Do not decode resources.
+            public const string NoResource = " -r";
+
+            //don't write out debug info (.local, .param, .line, etc.)
+            //The -b flag has been removed from APKtool 3.0.1 and later versions,
+            //but the --no-debug-info flag is supported in all versions.
+            public const string NoDebugInfo = " --no-debug-info";
+
+            //Skip changes detection and build all files.
+            public const string Force = " -f";
+
+            //Uses framework files located in <dir>.
+            public const string FrameworkPath = " -p";
+
+            //Use if there was an error and some resources were dropped
+            public const string KeepBrokenResource = " -k";
+
+            //Keeps files to closest to original as possible. Prevents rebuild.
+            public const string MatchOriginal = " -m";
+
+            //The name of folder that gets written. Default is apk.out
+            public const string OutputDir = " -o";
+
+            //Only disassemble the main dex classes (classes[0-9]*.dex) in the root.
+            public const string OnlyMainClasses = " --only-main-classes";
+
+            //The numeric api-level of the file to generate, e.g. 14 for ICS.
+            public const string ApiLevel = " -api";
+
+            // Sets the number of threads to use.
+            public const string Jobs = " -j";
        }

        static class BuildKeys
        {
-            public const string ForceAll = " -f"; //Skip changes detection and build all files.
-            public const string CopyOriginal = " -c"; //opies original AndroidManifest.xml and META-INF. See project page for more info.
-            public const string Aapt = " -a"; //Loads aapt from specified location.
-            public const string FrameworkPath = " -p"; //Uses framework files located in <dir>.
-            public const string OutputAppPath = " -o"; // The name of apk that gets written. Default is dist/name.apk
-            public const string NoCrunch = " -nc"; // Disable crunching of resource files during the build step.
-            public const string ApiLevel = " -api"; //The numeric api-level of the file to generate, e.g. 14 for ICS.
-            public const string UseAapt2 = " --use-aapt2"; //Upgrades apktool to use experimental aapt2 binary.
-            public const string NetSecConf = " --net-sec-conf"; //Add a generic Network Security Configuration file in the output APK
-            public const string Jobs = " -j"; // Sets the number of threads to use.
+            //Skip changes detection and build all files.
+            public const string ForceAll = " -f";
+
+            //opies original AndroidManifest.xml and META-INF. See project page for more info.
+            public const string CopyOriginal = " -c";
+
+            //Loads aapt from specified location.
+            public const string Aapt = " -a";
+
+            //Uses framework files located in <dir>.
+            public const string FrameworkPath = " -p";
+
+            // The name of apk that gets written. Default is dist/name.apk
+            public const string OutputAppPath = " -o";
+
+            // Disable crunching of resource files during the build step.
+            public const string NoCrunch = " -nc";
+
+            //The numeric api-level of the file to generate, e.g. 14 for ICS.
+            public const string ApiLevel = " -api";
+
+            //Upgrades apktool to use experimental aapt2 binary.
+            public const string UseAapt2 = " --use-aapt2";
+
+            //Add a generic Network Security Configuration file in the output APK
+            public const string NetSecConf = " --net-sec-conf";
+
+            // Sets the number of threads to use.
+            public const string Jobs = " -j";
        }

        static class InstallFrameworkKeys
        {
-            public const string FrameDir = " -p"; //Stores framework files into <dir>.
-            public const string Tag = " -t"; //Tag frameworks using <tag>.
+            //Stores framework files into <dir>.
+            public const string FrameDir = " -p";
+
+            //Tag frameworks using <tag>.
+            public const string Tag = " -t";
        }

        static class EmptyFrameworkKeys
        {
-            public const string FrameDir = " -p"; //Stores framework files into <dir>.
-            public const string ForceDelete = " -f"; //Force delete destination directory.
+            //Stores framework files into <dir>.
+            public const string FrameDir = " -p";
+
+            //Force delete destination directory.
+            public const string ForceDelete = " -f";
+
+            //Include all framework files regardless of tag. (3.0.1+)
+            public const string All = " -a";
        }

        ApktoolDataReceivedEventHandler onApktoolOutputDataRecieved;
@@ -89,15 +154,6 @@ namespace APKToolGUI
            }
        }

-        string _jarPath;
-        public Apktool(string javaPath, string jarPath) : base(javaPath, jarPath)
-        {
-            _jarPath = jarPath;
-            Exited += Apktool_Exited;
-            OutputDataReceived += Apktool_OutputDataReceived;
-            ErrorDataReceived += Apktool_ErrorDataReceived;
-        }
-
        private void Apktool_ErrorDataReceived(object sender, DataReceivedEventArgs e)
        {
            if (onApktoolErrorDataRecieved != null && e.Data != null)
@@ -118,7 +174,7 @@ namespace APKToolGUI

        public int Decompile(string inputPath, string outputDir)
        {
-            string keyNoSrc = null, keyNoRes = null, keyForce = null, keyFramePath = null, keyMatchOriginal = null, keyOutputDir = null, onlyMainClasses = null, noDebugInfo = null, keyKeepBrokenRes = null, apiLevel = null;
+            string keyNoSrc = null, keyNoRes = null, keyForce = null, keyFramePath = null, keyMatchOriginal = null, keyOutputDir = null, onlyMainClasses = null, noDebugInfo = null, keyKeepBrokenRes = null, apiLevel = null, jobs = null;

            if (Settings.Default.Decode_NoSrc)
                keyNoSrc = DecompileKeys.NoSource;
@@ -130,7 +186,7 @@ namespace APKToolGUI
                keyKeepBrokenRes = DecompileKeys.KeepBrokenResource;
            if (Settings.Default.Decode_MatchOriginal)
                keyMatchOriginal = DecompileKeys.MatchOriginal;
-            if (Settings.Default.Decode_OnlyMainClasses && !Settings.Default.Decode_NoSrc)
+            if (Settings.Default.Decode_OnlyMainClasses && !Settings.Default.Decode_NoSrc && IsVersionAtMost("2.12.1"))
                onlyMainClasses = DecompileKeys.OnlyMainClasses;
            if (Settings.Default.Decode_NoDebugInfo)
                noDebugInfo = DecompileKeys.NoDebugInfo;
@@ -141,12 +197,12 @@ namespace APKToolGUI
            if (Settings.Default.Decode_SetApiLevel)
                apiLevel = String.Format("{0} {1}", DecompileKeys.ApiLevel, Settings.Default.Decode_ApiLevel);
            if (Settings.Default.Decode_SetJobs)
-                apiLevel = String.Format("{0} {1}", DecompileKeys.Jobs, Settings.Default.Decode_Jobs);
+                jobs = String.Format("{0} {1}", DecompileKeys.Jobs, Settings.Default.Decode_Jobs);
            keyOutputDir = String.Format("{0} \"{1}\"", DecompileKeys.OutputDir, outputDir);

-            string args = String.Format($"d{keyNoSrc}{keyNoRes}{keyForce}{onlyMainClasses}{noDebugInfo}{keyMatchOriginal}{keyFramePath}{keyKeepBrokenRes}{apiLevel}{keyOutputDir} \"{inputPath}\"");
+            string args = String.Format($"d{keyNoSrc}{keyNoRes}{keyForce}{onlyMainClasses}{noDebugInfo}{keyMatchOriginal}{keyFramePath}{keyKeepBrokenRes}{apiLevel}{jobs}{keyOutputDir} \"{inputPath}\"");

-            Log.d("Apktool CMD: " + _jarPath + " " + args);
+            Log.d("Apktool CMD: " + JarPath + " " + args);

            Start(args);
            BeginOutputReadLine();
@@ -155,28 +211,9 @@ namespace APKToolGUI
            return ExitCode;
        }

-        public void Cancel()
-        {
-            try
-            {
-                foreach (var process in Process.GetProcessesByName("java"))
-                {
-                    if (process.Id == Id)
-                    {
-                        ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
-                        process.Kill();
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex);
-            }
-        }
-
        public int Build(string inputFolder, string outputFile)
        {
-            string keyForceAll = null, keyAapt = null, keyCopyOriginal = null, noCrunch = null, keyFramePath = null, keyOutputAppPath = null, apiLevel = null, useAapt2 = null, netSecConf = null;
+            string keyForceAll = null, keyAapt = null, keyCopyOriginal = null, noCrunch = null, keyFramePath = null, keyOutputAppPath = null, apiLevel = null, jobs = null, useAapt2 = null, netSecConf = null;

            if (Settings.Default.Build_ForceAll)
                keyForceAll = BuildKeys.ForceAll;
@@ -193,16 +230,16 @@ namespace APKToolGUI
            if (Settings.Default.Build_SetApiLevel)
                apiLevel = String.Format("{0} {1}", BuildKeys.ApiLevel, Settings.Default.Build_ApiLevel);
            if (Settings.Default.Build_SetJobs)
-                apiLevel = String.Format("{0} {1}", BuildKeys.Jobs, Settings.Default.Build_Jobs);
+                jobs = String.Format("{0} {1}", BuildKeys.Jobs, Settings.Default.Build_Jobs);
            if (Settings.Default.Build_UseAapt2)
                useAapt2 = BuildKeys.UseAapt2;
            if (Settings.Default.Build_NetSecConf)
                netSecConf = BuildKeys.NetSecConf;
            keyOutputAppPath = String.Format("{0} \"{1}\"", BuildKeys.OutputAppPath, outputFile);

-            string args = String.Format($"b{keyForceAll}{keyAapt}{keyCopyOriginal}{noCrunch}{keyFramePath}{apiLevel}{useAapt2}{netSecConf}{keyOutputAppPath} \"{inputFolder}\"");
+            string args = String.Format($"b{keyForceAll}{keyAapt}{keyCopyOriginal}{noCrunch}{keyFramePath}{apiLevel}{jobs}{useAapt2}{netSecConf}{keyOutputAppPath} \"{inputFolder}\"");

-            Log.d("Apktool CMD: " + _jarPath + " " + args);
+            Log.d("Apktool CMD: " + JarPath + " " + args);

            Start(args);
            BeginOutputReadLine();
@@ -223,7 +260,7 @@ namespace APKToolGUI

            string args = String.Format($"if{keyFrameDir}{keyTag} \"{inputPath}\"");

-            Log.d("Apktool CMD: " + _jarPath + " " + args);
+            Log.d("Apktool CMD: " + JarPath + " " + args);

            Start(args);
            BeginOutputReadLine();
@@ -241,8 +278,10 @@ namespace APKToolGUI
                keyFramePath = String.Format("{0} \"{1}\"", DecompileKeys.FrameworkPath, Program.STANDALONE_FRAMEWORK_DIR);

            string args = String.Format($"empty-framework-dir {EmptyFrameworkKeys.ForceDelete} {keyFramePath}");
+            if (IsVersionAtLeast("3.0.1"))
+                args = String.Format($"clean-frameworks {EmptyFrameworkKeys.All} {keyFramePath}");

-            Log.d("Apktool CMD: " + _jarPath + " " + args);
+            Log.d("Apktool CMD: " + JarPath + " " + args);

            Start(args);
            BeginOutputReadLine();
@@ -251,7 +290,54 @@ namespace APKToolGUI
            return ExitCode;
        }

+        public bool IsVersionAtLeast(string minimumVersion)
+        {
+            if (String.IsNullOrWhiteSpace(minimumVersion))
+                throw new ArgumentException("Minimum version cannot be null or empty.", nameof(minimumVersion));
+
+            return ParsedVersion.CompareTo(new Version(minimumVersion)) >= 0;
+        }
+
+        public bool IsVersionAtMost(string maximumVersion)
+        {
+            if (String.IsNullOrWhiteSpace(maximumVersion))
+                throw new ArgumentException("Maximum version cannot be null or empty.", nameof(maximumVersion));
+
+            return ParsedVersion.CompareTo(new Version(maximumVersion)) <= 0;
+        }
+
+        private static Version ParseVersion(string rawVersion)
+        {
+            if (String.IsNullOrWhiteSpace(rawVersion))
+                return null;
+
+            Match match = ApktoolVersionRegex.Match(rawVersion.Trim());
+            if (!match.Success)
+                return null;
+
+            try
+            {
+                return new Version(match.Groups["version"].Value);
+            }
+            catch (Exception)
+            {
+                return null;
+            }
+        }
+
        public string GetVersion()
+        {
+            using (JarProcess apktoolJar = new JarProcess(JavaPath, JarPath))
+            {
+                apktoolJar.EnableRaisingEvents = false;
+                apktoolJar.Start("version");
+                string version = apktoolJar.StandardOutput.ReadToEnd();
+                apktoolJar.WaitForExit(3000);
+                return version.Replace("\r\n", "");
+            }
+        }
+
+        public string GetVersionOld()
        {
            using (JarProcess apktoolJar = new JarProcess(JavaPath, JarPath))
            {
@@ -262,6 +348,70 @@ namespace APKToolGUI
                return version.Replace("\r\n", "");
            }
        }
+
+        public void Cancel()
+        {
+            try
+            {
+                foreach (var process in Process.GetProcessesByName("java"))
+                {
+                    using (process)
+                    {
+                        if (process.Id == Id)
+                        {
+                            ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
+                            process.Kill();
+                        }
+                    }
+                }
+            }
+            catch (InvalidOperationException ex)
+            {
+                Debug.WriteLine($"[Apktool] Process already exited: {ex.Message}");
+            }
+            catch (System.ComponentModel.Win32Exception ex)
+            {
+                Debug.WriteLine($"[Apktool] Failed to access process: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[Apktool] Failed to cancel process: {ex.Message}");
+            }
+        }
+
+        public new void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected new virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    try
+                    {
+                        Cancel();
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"[Apktool] Error during disposal: {ex.Message}");
+                    }
+                    finally
+                    {
+                        base.Dispose();
+                    }
+                }
+                disposed = true;
+            }
+        }
+
+        ~Apktool()
+        {
+            Dispose(false);
+        }
    }

    public delegate void ApktoolDataReceivedEventHandler(Object sender, ApktoolDataReceivedEventArgs e);
@@ -342,4 +492,13 @@ namespace APKToolGUI
        Error,
        Unknown
    }
+
+    enum ApktoolActionType
+    {
+        Decompile,
+        Build,
+        InstallFramework,
+        ClearFramework,
+        Null
+    }
 }
@@ -7,8 +7,10 @@ using APKToolGUI.Utils;

 namespace APKToolGUI
 {
-    public class Baksmali : JarProcess
+    public class Baksmali : JarProcess, IDisposable
    {
+        private bool disposed = false;
+
        public new event BaksmaliExitedEventHandler Exited;

        string _jarPath;
@@ -72,14 +74,28 @@ namespace APKToolGUI
            {
                foreach (var process in Process.GetProcessesByName("java"))
                {
-                    if (process.Id == Id)
+                    using (process)
                    {
-                        ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
-                        process.Kill();
+                        if (process.Id == Id)
+                        {
+                            ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
+                            process.Kill();
+                        }
                    }
                }
            }
-            catch { }
+            catch (InvalidOperationException ex)
+            {
+                Debug.WriteLine($"[Baksmali] Process already exited: {ex.Message}");
+            }
+            catch (System.ComponentModel.Win32Exception ex)
+            {
+                Debug.WriteLine($"[Baksmali] Failed to access process: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[Baksmali] Failed to cancel process: {ex.Message}");
+            }
        }

        public int Disassemble(string input, string output)
@@ -99,6 +115,40 @@ namespace APKToolGUI
            CancelErrorRead();
            return ExitCode;
        }
+
+        public new void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected new virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    try
+                    {
+                        Cancel();
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"[Baksmali] Error during disposal: {ex.Message}");
+                    }
+                    finally
+                    {
+                        base.Dispose();
+                    }
+                }
+                disposed = true;
+            }
+        }
+
+        ~Baksmali()
+        {
+            Dispose(false);
+        }
    }

    public class BaksmaliExitedEventArgs : EventArgs
@@ -7,8 +7,10 @@ using System.IO.Packaging;

 namespace APKToolGUI
 {
-    public class Signapk : JarProcess
+    public class Signapk : JarProcess, IDisposable
    {
+        private bool disposed = false;
+
        public new event SignapkExitedEventHandler Exited;

        private string lastSourceApk;
@@ -75,14 +77,28 @@ namespace APKToolGUI
            {
                foreach (var process in Process.GetProcessesByName("java"))
                {
-                    if (process.Id == Id)
+                    using (process)
                    {
-                        ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
-                        process.Kill();
+                        if (process.Id == Id)
+                        {
+                            ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
+                            process.Kill();
+                        }
                    }
                }
            }
-            catch { }
+            catch (InvalidOperationException ex)
+            {
+                Debug.WriteLine($"[Signapk] Process already exited: {ex.Message}");
+            }
+            catch (System.ComponentModel.Win32Exception ex)
+            {
+                Debug.WriteLine($"[Signapk] Failed to access process: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[Signapk] Failed to cancel process: {ex.Message}");
+            }
        }

        public int Sign(string input, string output)
@@ -152,6 +168,40 @@ namespace APKToolGUI
                return version;
            }
        }
+
+        public new void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected new virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    try
+                    {
+                        Cancel();
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"[Signapk] Error during disposal: {ex.Message}");
+                    }
+                    finally
+                    {
+                        base.Dispose();
+                    }
+                }
+                disposed = true;
+            }
+        }
+
+        ~Signapk()
+        {
+            Dispose(false);
+        }
    }

    public delegate void SignapkExitedEventHandler(object sender, SignapkExitedEventArgs e);
@@ -7,8 +7,10 @@ using APKToolGUI.Utils;

 namespace APKToolGUI
 {
-    public class Smali : JarProcess
+    public class Smali : JarProcess, IDisposable
    {
+        private bool disposed = false;
+
        public new event SmaliExitedEventHandler Exited;

        string _jarPath;
@@ -69,14 +71,28 @@ namespace APKToolGUI
            {
                foreach (var process in Process.GetProcessesByName("java"))
                {
-                    if (process.Id == Id)
+                    using (process)
                    {
-                        ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
-                        process.Kill();
+                        if (process.Id == Id)
+                        {
+                            ProcessUtils.KillAllProcessesSpawnedBy((uint)Id);
+                            process.Kill();
+                        }
                    }
                }
            }
-            catch { }
+            catch (InvalidOperationException ex)
+            {
+                Debug.WriteLine($"[Smali] Process already exited: {ex.Message}");
+            }
+            catch (System.ComponentModel.Win32Exception ex)
+            {
+                Debug.WriteLine($"[Smali] Failed to access process: {ex.Message}");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[Smali] Failed to cancel process: {ex.Message}");
+            }
        }

        public int Assemble(string input, string output)
@@ -96,6 +112,40 @@ namespace APKToolGUI
            CancelErrorRead();
            return ExitCode;
        }
+
+        public new void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected new virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    try
+                    {
+                        Cancel();
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine($"[Smali] Error during disposal: {ex.Message}");
+                    }
+                    finally
+                    {
+                        base.Dispose();
+                    }
+                }
+                disposed = true;
+            }
+        }
+
+        ~Smali()
+        {
+            Dispose(false);
+        }
    }

    public class SmaliExitedEventArgs : EventArgs
@@ -6,9 +6,11 @@ using System.IO;

 namespace APKToolGUI
 {
-    public class Zipalign
+    public class Zipalign : IDisposable
    {
        Process processZipalign;
+        private bool disposed = false;
+
        static class Keys
        {
            public const string CheckOnly = " -c";
@@ -37,10 +39,10 @@ namespace APKToolGUI
            processZipalign = new Process();
            processZipalign.EnableRaisingEvents = true;
            processZipalign.StartInfo.FileName = zipalignFileName;
-            processZipalign.StartInfo.UseShellExecute = false; //отключаем использование оболочки, чтобы можно было читать данные вывода
-            processZipalign.StartInfo.RedirectStandardOutput = true; // разрешаем перенаправление данных вывода
-            processZipalign.StartInfo.RedirectStandardError = true; // разрешаем перенаправление данных вывода
-            processZipalign.StartInfo.CreateNoWindow = true; //запрещаем создавать окно для запускаемой программы
+            processZipalign.StartInfo.UseShellExecute = false; // Disable shell execution to read output data
+            processZipalign.StartInfo.RedirectStandardOutput = true; // Allow output redirection
+            processZipalign.StartInfo.RedirectStandardError = true; // Allow error redirection
+            processZipalign.StartInfo.CreateNoWindow = true; // Do not create window for the launched program
            processZipalign.Exited += processZipalign_Exited;
        }

@@ -58,14 +60,62 @@ namespace APKToolGUI
            {
                foreach (var process in Process.GetProcessesByName("zipalign"))
                {
-                    if (process.Id == processZipalign.Id)
+                    using (process)
                    {
-                        ProcessUtils.KillAllProcessesSpawnedBy((uint)processZipalign.Id);
-                        process.Kill();
+                        if (process.Id == processZipalign.Id)
+                        {
+                            ProcessUtils.KillAllProcessesSpawnedBy((uint)processZipalign.Id);
+                            process.Kill();
+                        }
                    }
                }
            }
-            catch { }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[Zipalign] Cancel failed: {ex.Message}");
+                // Process termination failure is not critical, so continue
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!disposed)
+            {
+                if (disposing)
+                {
+                    if (processZipalign != null)
+                    {
+                        try
+                        {
+                            if (!processZipalign.HasExited)
+                            {
+                                processZipalign.Kill();
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            Debug.WriteLine($"[Zipalign] Error disposing process: {ex.Message}");
+                        }
+                        finally
+                        {
+                            processZipalign.Dispose();
+                            processZipalign = null;
+                        }
+                    }
+                }
+                disposed = true;
+            }
+        }
+
+        ~Zipalign()
+        {
+            Dispose(false);
        }

        public int Align(string input, string output)
@@ -102,11 +152,63 @@ namespace APKToolGUI
            processZipalign.BeginErrorReadLine();
            processZipalign.WaitForExit();

-            //if (!Settings.Default.Zipalign_CheckOnly && Settings.Default.Zipalign_OverwriteOutputFile)
-            //{
-            File.Delete(output);
-            File.Move(PathUtils.GetDirectoryNameWithoutExtension(output) + "_align_temp.apk", output);
-            //}
+            // Handle temp file (only when not in CheckOnly mode)
+            if (!Settings.Default.Zipalign_CheckOnly)
+            {
+                string tempFile = PathUtils.GetDirectoryNameWithoutExtension(output) + "_align_temp.apk";
+                
+                try
+                {
+                    // 1. Delete output file
+                    if (File.Exists(output))
+                    {
+                        File.Delete(output);
+                        Debug.WriteLine($"[Zipalign] Deleted existing output: {output}");
+                    }
+                    
+                    // 2. Check temp file existence and move
+                    if (File.Exists(tempFile))
+                    {
+                        File.Move(tempFile, output);
+                        Debug.WriteLine($"[Zipalign] Moved temp file to output: {tempFile} -> {output}");
+                    }
+                    else
+                    {
+                        Debug.WriteLine($"[Zipalign] Warning: Temp file not found: {tempFile}");
+                        return 1; // Return failure code
+                    }
+                }
+                catch (IOException ex)
+                {
+                    Debug.WriteLine($"[Zipalign] Failed to process output file: {ex.Message}");
+                    
+                    // Attempt to cleanup temp file
+                    try
+                    {
+                        if (File.Exists(tempFile))
+                        {
+                            File.Delete(tempFile);
+                            Debug.WriteLine($"[Zipalign] Cleaned up temp file: {tempFile}");
+                        }
+                    }
+                    catch (Exception cleanupEx)
+                    {
+                        Debug.WriteLine($"[Zipalign] Failed to cleanup temp file: {cleanupEx.Message}");
+                    }
+                    
+                    return 1;
+                }
+                catch (UnauthorizedAccessException ex)
+                {
+                    Debug.WriteLine($"[Zipalign] Access denied: {ex.Message}");
+                    return 1;
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"[Zipalign] Unexpected error processing output: {ex.Message}");
+                    return 1;
+                }
+            }

            return ExitCode;
        }
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
-    Sơ đồ Microsoft ResX
+    Microsoft ResX Schema 
    
-    Phiên bản 2.0
+    Version 2.0
    
-    Mục tiêu chính của định dạng này là cho phép một định dạng XML đơn giản
-    đọc được chủ yếu bằng tay. Việc tạo và phân tích cú pháp các
-    kiểu dữ liệu khác nhau được thực hiện thông qua các lớp TypeConverter
-    liên kết với các kiểu dữ liệu.
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
    
-    Ví dụ:
+    Example:
    
-    ... tiêu đề & sơ đồ ado.net/XML ...
+    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>đây là chuỗi dài của tôi</value><comment>đây là một bình luận</comment></data>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[đối tượng .NET Framework được tuần tự hóa mã hóa mime base64]</value>
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
    </data>
    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[chuỗi mã hóa mime base64 đại diện cho mảng byte của đối tượng .NET Framework]</value>
-        <comment>Đây là một bình luận</comment>
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
    </data>
                
-    Có bất kỳ số lượng hàng "resheader" nào chứa đơn giản
-    các cặp tên/giá trị.
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
    
-    Mỗi hàng dữ liệu chứa một tên và giá trị. Hàng cũng chứa một
-    kiểu hoặc mimetype. Kiểu tương ứng với một lớp .NET hỗ trợ
-    chuyển đổi văn bản/giá trị thông qua kiến trúc TypeConverter.
-    Các lớp không hỗ trợ điều này được tuần tự hóa và lưu trữ với
-    mimetype được đặt.
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
    
-    mimetype được sử dụng cho các đối tượng được tuần tự hóa và cho biết
-    ResXResourceReader cách khôi phục đối tượng. Hiện tại điều này không
-    có thể mở rộng. Đối với một mimetype nhất định, giá trị phải được đặt cho phù hợp:
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
    
-    Lưu ý - application/x-microsoft.net.object.binary.base64 là định dạng
-    mà ResXResourceWriter sẽ tạo ra, tuy nhiên trình đọc có thể
-    đọc bất kỳ định dạng nào được liệt kê bên dưới.
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
    
    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : Đối tượng phải được tuần tự hóa với
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : và sau đó được mã hóa bằng mã hóa base64.
+            : and then encoded with base64 encoding.
    
    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : Đối tượng phải được tuần tự hóa với
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : và sau đó được mã hóa bằng mã hóa base64.
+            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : Đối tượng phải được tuần tự hóa thành một mảng byte
-            : sử dụng System.ComponentModel.TypeConverter
-            : và sau đó được mã hóa bằng mã hóa base64.
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
    -->
  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
@@ -130,9 +130,9 @@
    <value>Mô tả</value>
  </data>
  <data name="linkLabel1.Text" xml:space="preserve">
-    <value>Phản hồi Github</value>
+    <value>Kho Github</value>
  </data>
  <data name="$this.Text" xml:space="preserve">
    <value>Giới thiệu</value>
  </data>
-</root>
+</root>
@@ -828,6 +828,7 @@
            resources.ApplyResources(this.apkIconPicBox, "apkIconPicBox");
            this.apkIconPicBox.Name = "apkIconPicBox";
            this.apkIconPicBox.TabStop = false;
+            this.apkIconPicBox.Click += new System.EventHandler(this.apkIconPicBox_Click);
            // 
            // label11
            // 
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
@@ -16,6 +17,7 @@ using System.Media;
 using System.Linq;
 using APKToolGUI.Controls;
 using Ionic.Zip;
+using System.Text.RegularExpressions;

 namespace APKToolGUI
 {
@@ -39,6 +41,8 @@ namespace APKToolGUI
        private Stopwatch stopwatch = new Stopwatch();
        private string lastStartedDate;

+        private Image previousApkIcon;
+
        internal static FormMain Instance { get; private set; }

        public FormMain()
@@ -55,6 +59,8 @@ namespace APKToolGUI
            Text += " - v" + ProductVersion;
            Application.ApplicationExit += new EventHandler(Application_ApplicationExit);

+            aapt = new AaptParser();
+
            if (!File.Exists(Settings.Default.Decode_InputAppPath))
                Settings.Default.Decode_InputAppPath = "";
            if (!Directory.Exists(Settings.Default.Build_InputDir))
@@ -171,116 +177,159 @@ namespace APKToolGUI
        #region Get APK Info
        internal async Task GetApkInfo(string file)
        {
-            if (File.Exists(file))
+            if (!File.Exists(file))
+                return;
+
+            ToLog(ApktoolEventType.None, Language.ParsingApkInfo);
+            ToStatus(Language.ParsingApkInfo, Resources.waiting);
+
+            try
            {
-                ToLog(ApktoolEventType.None, Language.ParsingApkInfo);
-                ToStatus(Language.ParsingApkInfo, Resources.waiting);
+                string splitPath = Path.Combine(Program.TEMP_PATH, "SplitInfo");
+                
+                // Parse APK in background
+                var parseResult = await ParseApkInBackgroundAsync(file, splitPath);

-                try
+                if (parseResult.Success)
                {
-                    string splitPath = Path.Combine(Program.TEMP_PATH, "SplitInfo");
-                    string arch = "";
-
-                    bool parsed = false;
-
-                    await Task.Factory.StartNew(() =>
-                    {
-                        DirectoryUtils.Delete(splitPath);
-                        if (file.ContainsAny(".xapk", ".zip", ".apks", ".apkm"))
-                        {
-                            Directory.CreateDirectory(splitPath);
-
-                            using (ZipFile zipDest = ZipFile.Read(file))
-                            {
-                                bool mainApkFound = false;
-
-                                foreach (ZipEntry entry in zipDest.Entries)
-                                {
-                                    if (!mainApkFound && !entry.FileName.Contains("config.") && entry.FileName.EndsWith(".apk"))
-                                    {
-                                        Debug.WriteLine("Found main APK: " + entry.FileName);
-                                        string extractPath = Path.Combine(splitPath, entry.FileName);
-                                        Directory.CreateDirectory(Path.GetDirectoryName(extractPath));
-                                        entry.Extract(splitPath, ExtractExistingFileAction.OverwriteSilently);
-                                        file = extractPath;
-                                        mainApkFound = true;
-                                    }
-
-                                    if (entry.FileName.Contains("lib/armeabi-v7a"))
-                                    {
-                                        arch += "armeabi-v7a, ";
-                                    }
-                                    if (entry.FileName.Contains("lib/arm64-v8a"))
-                                    {
-                                        arch += "arm64-v8a, ";
-                                    }
-                                    if (entry.FileName.Contains("lib/x86"))
-                                    {
-                                        arch += "x86, ";
-                                    }
-                                    if (entry.FileName.Contains("lib/x86_64"))
-                                    {
-                                        arch += "x86_64, ";
-                                    }
-                                }
-                            }
-                        }
-
-                        aapt = new AaptParser();
-                        parsed = aapt.Parse(file);
-                    });
-
-                    if (parsed)
-                    {
-                        if (apkIconPicBox.Image != null)
-                        {
-                            apkIconPicBox.Image.Dispose();
-                            apkIconPicBox.Image = null;
-                        }
-                        fileTxtBox.Text = aapt.ApkFile;
-                        appTxtBox.Text = aapt.AppName;
-                        packNameTxtBox.Text = aapt.PackageName;
-                        verTxtBox.Text = aapt.VersionName;
-                        buildTxtBox.Text = aapt.VersionCode;
-                        minSdkTxtBox.Text = aapt.MinSdkVersionDetailed;
-                        targetSdkTxtBox.Text = aapt.TargetSdkVersionDetailed;
-                        screenTxtBox.Text = aapt.Screens;
-                        densityTxtBox.Text = aapt.Densities;
-                        permTxtBox.Text = aapt.Permissions;
-                        localsTxtBox.Text = aapt.Locales;
-                        fullInfoTextBox.Text = aapt.FullInfo;
-                        if (!String.IsNullOrEmpty(aapt.NativeCode))
-                            archSdkTxtBox.Text = aapt.NativeCode;
-                        else
-                            archSdkTxtBox.Text = arch.RemoveLast(", ");
-                        launchActivityTxtBox.Text = aapt.LaunchableActivity;
-
-                        apkIconPicBox.Image = BitmapUtils.LoadBitmap(aapt.GetIcon(file));
-
-                        DirectoryUtils.Delete(splitPath);
-                    }
-
-                    string signature = null;
-                    sigTxtBox.Text = "Loading...";
-
-                    await Task.Factory.StartNew(() =>
-                    {
-                        signature = signapk.GetSignature(file);
-                    });
-
-                    sigTxtBox.Text = signature;
-                }
-                catch (Exception ex)
-                {
-#if DEBUG
-                    ToLog(ApktoolEventType.Warning, Language.ErrorGettingApkInfo + "\n" + ex.ToString());
-#else
-                    ToLog(ApktoolEventType.Warning, Language.ErrorGettingApkInfo);
-#endif
+                    // UI update is automatically executed on UI thread
+                    UpdateApkInfoUI(parseResult);
+                    
+                    // Get signature info in background
+                    var signature = await Task.Run(() => signapk.GetSignature(parseResult.ActualFilePath));
+                    
+                    // Update signature info UI
+                    InvokeOnUIThread(() => sigTxtBox.Text = signature);
                }
+
                ToLog(ApktoolEventType.Success, Language.Done);
                ToStatus(Language.Done, Resources.done);
            }
+#if DEBUG
+            catch (Exception ex)
+            {
+                ToLog(ApktoolEventType.Warning, Language.ErrorGettingApkInfo + "\n" + ex.ToString());
+            }
+#else
+            catch (Exception)
+            {
+                ToLog(ApktoolEventType.Warning, Language.ErrorGettingApkInfo);
+            }
+#endif
+        }
+
+        private async Task<ApkParseResult> ParseApkInBackgroundAsync(string file, string splitPath)
+        {
+            return await Task.Run(() =>
+            {
+                try
+                {
+                    DirectoryUtils.Delete(splitPath);
+                    List<string> archList = new List<string>();
+                    string actualFile = file;
+
+                    if (file.ContainsAny(".xapk", ".zip", ".apks", ".apkm"))
+                    {
+                        Directory.CreateDirectory(splitPath);
+
+                        using (ZipFile zipDest = ZipFile.Read(file))
+                        {
+                            bool mainApkFound = false;
+
+                            foreach (ZipEntry entry in zipDest.Entries)
+                            {
+                                if (!mainApkFound && !entry.FileName.Contains("config.") && entry.FileName.EndsWith(".apk"))
+                                {
+                                    Debug.WriteLine("Found main APK: " + entry.FileName);
+                                    string extractPath = Path.Combine(splitPath, entry.FileName);
+                                    Directory.CreateDirectory(Path.GetDirectoryName(extractPath));
+                                    entry.Extract(splitPath, ExtractExistingFileAction.OverwriteSilently);
+                                    actualFile = extractPath;
+                                    mainApkFound = true;
+                                }
+
+                                if (entry.FileName.Contains("lib/armeabi-v7a") && !archList.Contains("armeabi-v7a"))
+                                    archList.Add("armeabi-v7a");
+                                if (entry.FileName.Contains("lib/arm64-v8a") && !archList.Contains("arm64-v8a"))
+                                    archList.Add("arm64-v8a");
+                                if (entry.FileName.Contains("lib/x86") && !archList.Contains("x86"))
+                                    archList.Add("x86");
+                                if (entry.FileName.Contains("lib/x86_64") && !archList.Contains("x86_64"))
+                                    archList.Add("x86_64");
+                            }
+                        }
+                    }
+
+                    var aaptParser = new AaptParser();
+                    var parsed = aaptParser.Parse(actualFile);
+
+                    DirectoryUtils.Delete(splitPath);
+
+                    return new ApkParseResult
+                    {
+                        Success = parsed,
+                        Aapt = aaptParser,
+                        Architecture = string.Join(", ", archList),
+                        ActualFilePath = actualFile
+                    };
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"Error parsing APK: {ex.Message}");
+                    DirectoryUtils.Delete(splitPath);
+                    return new ApkParseResult { Success = false };
+                }
+            });
+        }
+
+        private void UpdateApkInfoUI(ApkParseResult result)
+        {
+            // Explicitly dispose previous image
+            if (previousApkIcon != null)
+            {
+                previousApkIcon.Dispose();
+                previousApkIcon = null;
+                Debug.WriteLine("[FormMain] Disposed previous APK icon");
+            }
+
+            // Remove PictureBox image reference
+            if (apkIconPicBox.Image != null)
+            {
+                apkIconPicBox.Image = null;
+            }
+
+            fileTxtBox.Text = result.Aapt.ApkFile;
+            appTxtBox.Text = result.Aapt.AppName;
+            packNameTxtBox.Text = result.Aapt.PackageName;
+            verTxtBox.Text = result.Aapt.VersionName;
+            buildTxtBox.Text = result.Aapt.VersionCode;
+            minSdkTxtBox.Text = result.Aapt.MinSdkVersionDetailed;
+            targetSdkTxtBox.Text = result.Aapt.TargetSdkVersionDetailed;
+            screenTxtBox.Text = result.Aapt.Screens;
+            densityTxtBox.Text = result.Aapt.Densities;
+            permTxtBox.Text = result.Aapt.Permissions;
+            localsTxtBox.Text = result.Aapt.Locales;
+            fullInfoTextBox.Text = result.Aapt.FullInfo;
+            launchActivityTxtBox.Text = result.Aapt.LaunchableActivity;
+
+            if (!String.IsNullOrEmpty(result.Aapt.NativeCode))
+                archSdkTxtBox.Text = result.Aapt.NativeCode;
+            else
+                archSdkTxtBox.Text = result.Architecture;
+
+            // Load new image and save reference
+            previousApkIcon = BitmapUtils.LoadBitmap(result.Aapt.GetIcon(result.ActualFilePath));
+            apkIconPicBox.Image = previousApkIcon;
+            
+            sigTxtBox.Text = "Loading...";
+        }
+
+        private class ApkParseResult
+        {
+            public bool Success { get; set; }
+            public AaptParser Aapt { get; set; }
+            public string Architecture { get; set; }
+            public string ActualFilePath { get; set; }
        }
        #endregion

@@ -321,29 +370,22 @@ namespace APKToolGUI
        #region Log & Status
        internal void ToStatus(string message, Image statusImage)
        {
-            BeginInvoke(new MethodInvoker(delegate
+            BeginInvokeOnUIThread(() =>
            {
                toolStripStatusLabelStateText.Text = message.Replace("\n", "").Replace("\r", "");
                toolStripStatusLabelStateImage.Image = statusImage;
-            }));
+            });
        }

        internal void ToLog(string time, string message, Color backColor)
        {
            Debug.WriteLine(time + " " + message);

-            if (logTxtBox.InvokeRequired)
-                Invoke(new Action(delegate ()
-                {
-                    //richTextBox1.SelectionColor = color ?? Color.Black;
-                    logTxtBox.SelectionColor = backColor;
-                    logTxtBox.AppendText(time + " " + message + Environment.NewLine);
-                }));
-            else
+            InvokeOnUIThread(() =>
            {
                logTxtBox.SelectionColor = backColor;
                logTxtBox.AppendText(time + " " + message + Environment.NewLine);
-            }
+            });
        }

        internal void ToLog(ApktoolEventType eventType, string message)
@@ -382,6 +424,7 @@ namespace APKToolGUI
                        color = Color.DarkOrange;
                    else
                        color = Color.Orange;
+                        color = Color.White;
                    break;
                case ApktoolEventType.Unknown:
                    if (Program.IsDarkTheme())
@@ -536,7 +579,7 @@ namespace APKToolGUI
                DirectoryUtils.Delete(splitDir);
                Directory.CreateDirectory(splitDir);

-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    if (Settings.Default.Framework_ClearBeforeDecode)
                    {
@@ -573,10 +616,10 @@ namespace APKToolGUI
                            DirectoryUtils.Delete(outputDir);
                            DirectoryUtils.Copy(tempDecApk, outputDir);

-                            textBox_BUILD_InputProjectDir.BeginInvoke(new Action(delegate
+                            BeginInvokeOnUIThread(() =>
                            {
                                textBox_BUILD_InputProjectDir.Text = outputDir;
-                            }));
+                            });

                            ToLog(ApktoolEventType.None, String.Format(Language.DecompilingSuccessfullyCompleted, outputDir));
                            if (Settings.Default.Decode_FixError)
@@ -626,7 +669,7 @@ namespace APKToolGUI

            try
            {
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    ToLog(ApktoolEventType.None, String.Format(Language.InputFile, inputSplitApk));

@@ -661,15 +704,10 @@ namespace APKToolGUI
        #region Apktool
        public async void SetApktoolPath()
        {
-            apktool.JarPath = Program.APKTOOL_PATH;
-            if (Settings.Default.UseCustomApktool)
-            {
-                apktool.JarPath = Settings.Default.ApktoolPath;
-            }
+            InitializeAPKTool();

-            string apktoolVersion = apktool.GetVersion();
-            if (!String.IsNullOrWhiteSpace(apktoolVersion))
-                ToLog(ApktoolEventType.None, String.Format(Language.APKToolVersion + " \"{0}\"", apktoolVersion));
+            if (!String.IsNullOrWhiteSpace(apktool.Version))
+                ToLog(ApktoolEventType.None, $"{Language.APKToolVersion} \"{apktool.Version}\"");
            else
                ToLog(ApktoolEventType.Error, Language.CantDetectApktoolVersion);

@@ -713,7 +751,7 @@ namespace APKToolGUI

            try
            {
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    if (apktool.ClearFramework() == 0)
                    {
@@ -758,7 +796,7 @@ namespace APKToolGUI
                    ToLog(ApktoolEventType.Error, String.Format(Language.DecodeDesDirExists, outputDir));
                    return 1;
                }
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    if (Settings.Default.Framework_ClearBeforeDecode && !Settings.Default.UseApkeditor)
                    {
@@ -797,10 +835,10 @@ namespace APKToolGUI
                            DirectoryUtils.Copy(outputTempDir, outputDir);
                        }

-                        textBox_BUILD_InputProjectDir.BeginInvoke(new Action(delegate
+                        BeginInvokeOnUIThread(() =>
                        {
                            textBox_BUILD_InputProjectDir.Text = outputDir;
-                        }));
+                        });

                        ToLog(ApktoolEventType.None, String.Format(Language.DecompilingSuccessfullyCompleted, outputDir));
                        if (Settings.Default.Decode_FixError && !useAPKEditorForDecompilingItem.Checked)
@@ -998,7 +1036,7 @@ namespace APKToolGUI
                Running(Language.DecompilingDex);
                ToLog(ApktoolEventType.None, String.Format(Language.InputFile, inputFile));

-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    string outputDir = String.Format("{0}", Path.Combine(Path.GetDirectoryName(inputFile), "dexout", Path.GetFileNameWithoutExtension(inputFile)));
                    if (Settings.Default.Baksmali_UseOutputDir && !IgnoreOutputDirContextMenu)
@@ -1007,10 +1045,10 @@ namespace APKToolGUI
                    code = baksmali.Disassemble(inputFile, outputDir);
                    if (code == 0)
                    {
-                        textBox_BUILD_InputProjectDir.BeginInvoke(new Action(delegate
+                        BeginInvokeOnUIThread(() =>
                        {
                            smaliBrowseInputDirTxtBox.Text = outputDir;
-                        }));
+                        });
                        Done(String.Format(Language.DecompilingSuccessfullyCompleted, outputDir));
                    }
                    else
@@ -1054,7 +1092,7 @@ namespace APKToolGUI

                ToLog(ApktoolEventType.None, String.Format(Language.InputDirectory, inputDir));

-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    string outputDir = String.Format("{0}.dex", inputDir);
                    if (Settings.Default.Smali_UseOutputDir && !IgnoreOutputDirContextMenu)
@@ -1111,7 +1149,7 @@ namespace APKToolGUI

            try
            {
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    string tempApk = Path.Combine(Program.TEMP_PATH, "tempapk.apk");
                    string outputApkFile = outputDir;
@@ -1192,7 +1230,7 @@ namespace APKToolGUI
            Running(Language.Signing);

            string outputFile = input;
-            if (Settings.Default.Zipalign_UseOutputDir && !IgnoreOutputDirContextMenu)
+            if (Settings.Default.Sign_UseOutputDir && !IgnoreOutputDirContextMenu)
                outputFile = Path.Combine(Settings.Default.Sign_OutputDir, Path.GetFileName(input));
            if (!Settings.Default.Sign_OverwriteInputFile)
                outputFile = PathUtils.GetDirectoryNameWithoutExtension(outputFile) + "_signed.apk";
@@ -1204,7 +1242,7 @@ namespace APKToolGUI

            try
            {
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    if (Settings.Default.Utf8FilenameSupport)
                    {
@@ -1298,7 +1336,7 @@ namespace APKToolGUI
            {
                devicesListBox.Items.Clear();

-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    devices = adb.GetDevices();
                });
@@ -1348,7 +1386,7 @@ namespace APKToolGUI

            try
            {
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    code = adb.Install(device, inputApk);
                    if (code == 0)
@@ -1374,7 +1412,7 @@ namespace APKToolGUI
        #region Form handlers
        private async void FormMain_Shown(object sender, EventArgs e)
        {
-            await Task.Factory.StartNew(() =>
+            await Task.Run(() =>
            {
                InitializeUpdateChecker();
                InitializeZipalign();
@@ -1392,13 +1430,13 @@ namespace APKToolGUI
                    if (javaVersion != null)
                    {
                        ToLog(ApktoolEventType.None, javaVersion);
-                        string apktoolVersion = apktool.GetVersion();
-                        string apkeditorVersion = apkeditor.GetVersion();
-                        if (!String.IsNullOrWhiteSpace(apktoolVersion))
-                            ToLog(ApktoolEventType.None, String.Format(Language.APKToolVersion + " {0}", apktoolVersion));
+
+                        if (!String.IsNullOrWhiteSpace(apktool.Version) && !Regex.IsMatch(apktool.Version, @"\r\n?|\n"))
+                            ToLog(ApktoolEventType.None, $"{Language.APKToolVersion} {apktool.Version}");
                        else
                            ToLog(ApktoolEventType.Error, Language.CantDetectApktoolVersion);

+                        string apkeditorVersion = apkeditor.GetVersion();
                        if (!String.IsNullOrWhiteSpace(apkeditorVersion))
                            ToLog(ApktoolEventType.None, apkeditorVersion);
                        else
@@ -1443,7 +1481,7 @@ namespace APKToolGUI
            Running(Language.ClearTempFolder);
            try
            {
-                await Task.Factory.StartNew(() =>
+                await Task.Run(() =>
                {
                    foreach (var subDir in new DirectoryInfo(Program.TEMP_MAIN).EnumerateDirectories())
                    {
@@ -1478,6 +1516,39 @@ namespace APKToolGUI
        {
            Save();

+            // Dispose APK icon image
+            try
+            {
+                if (previousApkIcon != null)
+                {
+                    previousApkIcon.Dispose();
+                    previousApkIcon = null;
+                    Debug.WriteLine("[FormMain] Cleaned up APK icon on exit");
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[FormMain] Error disposing APK icon: {ex.Message}");
+            }
+
+            // Dispose all tool instances
+            try
+            {
+                adb?.Dispose();
+                zipalign?.Dispose();
+                apktool?.Dispose();
+                signapk?.Dispose();
+                baksmali?.Dispose();
+                smali?.Dispose();
+                apkeditor?.Dispose();
+                
+                Debug.WriteLine("[FormMain] All tool instances disposed successfully");
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[FormMain] Error disposing resources: {ex.Message}");
+            }
+
            DirectoryUtils.Delete(Program.TEMP_PATH);
        }

@@ -1485,69 +1556,17 @@ namespace APKToolGUI
        {
            set
            {
-                if (button_BUILD_Build.InvokeRequired)
-                    button_BUILD_Build.BeginInvoke(new Action(delegate
-                    {
-                        button_BUILD_Build.Enabled = value;
-                    }));
-                else
+                BeginInvokeOnUIThread(() =>
+                {
                    button_BUILD_Build.Enabled = value;
-
-                if (button_DECODE_Decode.InvokeRequired)
-                    button_DECODE_Decode.BeginInvoke(new Action(delegate
-                    {
-                        button_DECODE_Decode.Enabled = value;
-                    }));
-                else
                    button_DECODE_Decode.Enabled = value;
-
-                if (button_IF_InstallFramework.InvokeRequired)
-                    button_IF_InstallFramework.BeginInvoke(new Action(delegate
-                    {
-                        button_IF_InstallFramework.Enabled = value;
-                    }));
-                else
                    button_IF_InstallFramework.Enabled = value;
-
-                if (button_ZIPALIGN_Align.InvokeRequired)
-                    button_ZIPALIGN_Align.BeginInvoke(new Action(delegate
-                    {
-                        button_ZIPALIGN_Align.Enabled = value;
-                    }));
-                else
                    button_ZIPALIGN_Align.Enabled = value;
-
-                if (button_SIGN_Sign.InvokeRequired)
-                    button_SIGN_Sign.BeginInvoke(new Action(delegate
-                    {
-                        button_SIGN_Sign.Enabled = value;
-                    }));
-                else
                    button_SIGN_Sign.Enabled = value;
-
-                if (decSmaliBtn.InvokeRequired)
-                    decSmaliBtn.BeginInvoke(new Action(delegate
-                    {
-                        decSmaliBtn.Enabled = value;
-                    }));
-                else
                    decSmaliBtn.Enabled = value;
-
-                if (comSmaliBtn.InvokeRequired)
-                    comSmaliBtn.BeginInvoke(new Action(delegate
-                    {
-                        comSmaliBtn.Enabled = value;
-                    }));
-                else
                    comSmaliBtn.Enabled = value;
-
-                if (mergeApkBtn.InvokeRequired)
-                    mergeApkBtn.BeginInvoke(new Action(delegate
-                    {
-                        mergeApkBtn.Enabled = value;
-                    }));
-                else
                    mergeApkBtn.Enabled = value;
+                });
            }
        }

@@ -1555,15 +1574,18 @@ namespace APKToolGUI
        {
            set
            {
-                killAdbBtn.Enabled = value;
-                refreshDevicesBtn.Enabled = value;
-                installApkBtn.Enabled = value;
-                devicesListBox.Enabled = value;
-                apkPathAdbTxtBox.Enabled = value;
-                selApkAdbBtn.Enabled = value;
-                setVendorChkBox.Enabled = value;
-                overrideAbiCheckBox.Enabled = value;
-                overrideAbiComboBox.Enabled = value;
+                InvokeOnUIThread(() =>
+                {
+                    killAdbBtn.Enabled = value;
+                    refreshDevicesBtn.Enabled = value;
+                    installApkBtn.Enabled = value;
+                    devicesListBox.Enabled = value;
+                    apkPathAdbTxtBox.Enabled = value;
+                    selApkAdbBtn.Enabled = value;
+                    setVendorChkBox.Enabled = value;
+                    overrideAbiCheckBox.Enabled = value;
+                    overrideAbiComboBox.Enabled = value;
+                });
            }
        }

@@ -1571,6 +1593,53 @@ namespace APKToolGUI
        {
            MessageBox.Show(message, Application.ProductName, MessageBoxButtons.OK, status);
        }
+
+        #region UI Thread Helpers
+        /// <summary>
+        /// Execute action synchronously on UI thread
+        /// </summary>
+        private void InvokeOnUIThread(Action action)
+        {
+            if (InvokeRequired)
+            {
+                Invoke(action);
+            }
+            else
+            {
+                action();
+            }
+        }
+
+        /// <summary>
+        /// Execute action asynchronously on UI thread (Fire and forget)
+        /// </summary>
+        private void BeginInvokeOnUIThread(Action action)
+        {
+            if (InvokeRequired)
+            {
+                BeginInvoke(action);
+            }
+            else
+            {
+                action();
+            }
+        }
+
+        /// <summary>
+        /// Execute function on UI thread and return result
+        /// </summary>
+        private T InvokeOnUIThread<T>(Func<T> func)
+        {
+            if (InvokeRequired)
+            {
+                return (T)Invoke(func);
+            }
+            else
+            {
+                return func();
+            }
+        }
+        #endregion
        #endregion

        #region Config
@@ -1620,24 +1689,22 @@ namespace APKToolGUI
        }
        #endregion

-        #region Fix flickering
-        public static void SetDoubleBuffered(System.Windows.Forms.Control c)
+        private void apkIconPicBox_Click(object sender, EventArgs e)
        {
-            if (System.Windows.Forms.SystemInformation.TerminalServerSession)
-                return;
-            System.Reflection.PropertyInfo aProp = typeof(System.Windows.Forms.Control).GetProperty("DoubleBuffered", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance);
-            aProp.SetValue(c, true, null);
-        }
-
-        protected override CreateParams CreateParams
-        {
-            get
+            if (apkIconPicBox.Image != null)
            {
-                CreateParams cp = base.CreateParams;
-                cp.ExStyle |= 0x02000000;
-                return cp;
+                using (SaveFileDialog saveFile = new SaveFileDialog())
+                {
+                    saveFile.Filter = "PNG Image|*.png";
+                    saveFile.Title = "Save an Image File";
+                    saveFile.FileName = appTxtBox.Text; // Set default filename to app name
+
+                    if (saveFile.ShowDialog() == DialogResult.OK && !String.IsNullOrEmpty(saveFile.FileName))
+                    {
+                        apkIconPicBox.Image.Save(saveFile.FileName, System.Drawing.Imaging.ImageFormat.Png);
+                    }
+                }
            }
        }
-        #endregion
    }
-}
+}
@@ -277,6 +277,9 @@
  <data name="groupBox_DECODE_Options.Text" xml:space="preserve">
    <value>Optionen</value>
  </data>
+  <data name="checkBox3.Text" xml:space="preserve">
+    <value>Anzahl der zu verwendenden Threads festlegen.</value>
+  </data>
  <data name="checkBox7.Size" type="System.Drawing.Size, System.Drawing">
    <value>457, 17</value>
  </data>
@@ -275,4 +275,79 @@
  <data name="label_SIGN_PublicKey.Text" xml:space="preserve">
    <value>Открытый ключ</value>
  </data>
+  <data name="tabPageMain.Text" xml:space="preserve">
+    <value>Главная</value>
+  </data>
+  <data name="tabPageApkInfo.Text" xml:space="preserve">
+    <value>Инфо APK</value>
+  </data>
+  <data name="checkBox4.Text" xml:space="preserve">
+    <value>Количество потоков:</value>
+  </data>
+  <data name="checkBox_BUILD_NetSecConf.Text" xml:space="preserve">
+    <value>Добавить файл конфигурации сетевой безопасности (Network Security Configuration)</value>
+  </data>
+  <data name="useAapt2ChkBox.Text" xml:space="preserve">
+    <value>Использовать aapt2 (для версий apktool &lt; 2.11.1)</value>
+  </data>
+  <data name="buildSetApiLvlChkBox.Text" xml:space="preserve">
+    <value>Установить уровень API (напр. 14 для ICS)</value>
+  </data>
+  <data name="createUnsignApkChkBox.Text" xml:space="preserve">
+    <value>Создать неподписанный APK с оригинальной подписью (Core Patch)</value>
+  </data>
+  <data name="signAfterBuildChkBox.Text" xml:space="preserve">
+    <value>Подписать после сборки / выравнивания</value>
+  </data>
+  <data name="zipalignAfterBuildChkBox.Text" xml:space="preserve">
+    <value>Выровнять после сборки</value>
+  </data>
+  <data name="checkBox_BUILD_NoCrunch.Text" xml:space="preserve">
+    <value>Отключить сжатие ресурсов</value>
+  </data>
+  <data name="tabPageBaksmali.Text" xml:space="preserve">
+    <value>Baksmali / Smali</value>
+  </data>
+  <data name="tabPageAdb.Text" xml:space="preserve">
+    <value>ADB</value>
+  </data>
+  <data name="mergeApkBtn.Text" xml:space="preserve">
+    <value>Слияние APK</value>
+  </data>
+  <data name="selSplitApkBtn.Text" xml:space="preserve">
+    <value>Выбрать Split APK</value>
+  </data>
+  <data name="baksmaliUseOutputChkBox.Text" xml:space="preserve">
+    <value>Свой каталог вывода:</value>
+  </data>
+  <data name="smaliUseOutputChkBox.Text" xml:space="preserve">
+    <value>Свой каталог вывода:</value>
+  </data>
+  <data name="killAdbBtn.Text" xml:space="preserve">
+    <value>Перезапустить ADB</value>
+  </data>
+  <data name="installApkBtn.Text" xml:space="preserve">
+    <value>Установить APK</value>
+  </data>
+  <data name="refreshDevicesBtn.Text" xml:space="preserve">
+    <value>Обновить список</value>
+  </data>
+  <data name="selApkAdbBtn.Text" xml:space="preserve">
+    <value>Выбрать APK</value>
+  </data>
+  <data name="overrideAbiCheckBox.Text" xml:space="preserve">
+    <value>Переопределить ABI:</value>
+  </data>
+  <data name="bakSmaliGroupBox.Text" xml:space="preserve">
+    <value>Baksmali (DEX -&gt; Smali)</value>
+  </data>
+  <data name="smaliGroupBox.Text" xml:space="preserve">
+    <value>Smali (Smali -&gt; DEX)</value>
+  </data>
+  <data name="decSmaliBtn.Text" xml:space="preserve">
+    <value>Дизассемблировать</value>
+  </data>
+  <data name="comSmaliBtn.Text" xml:space="preserve">
+    <value>Ассемблировать</value>
+  </data>
 </root>
@@ -139,7 +139,7 @@ namespace APKToolGUI
                if (Language.SystemLanguage.Equals(comboBox1.SelectedItem.ToString()))
                    Settings.Default.Culture = "Auto";
                else
-                    Settings.Default.Culture = StringExt.Regex(@"(?<=\[)(.*?)(?=\])", comboBox1.SelectedItem.ToString());
+                    Settings.Default.Culture = StringExt.RegexExtract(@"(?<=\[)(.*?)(?=\])", comboBox1.SelectedItem.ToString());

                Settings.Default.Theme = themeComboBox.SelectedIndex;
                Settings.Default.Save();
@@ -163,4 +163,19 @@
  <data name="$this.Text" xml:space="preserve">
    <value>Настройки</value>
  </data>
+  <data name="buttonCustomJavaLocation.Text" xml:space="preserve">
+    <value>Указать путь к Java</value>
+  </data>
+  <data name="useCustomApktoolChk.Text" xml:space="preserve">
+    <value>Свой путь к Apktool</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Тема</value>
+  </data>
+  <data name="checkBox6.Text" xml:space="preserve">
+    <value>Режим отладки</value>
+  </data>
+  <data name="checkBox7.Text" xml:space="preserve">
+    <value>Аргументы JVM</value>
+  </data>
 </root>
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
  <!-- 
    Microsoft ResX Schema 
@@ -117,18 +117,8 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="checkBox7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>126, 17</value>
-  </data>
  <data name="checkBox7.Text" xml:space="preserve">
-    <value>Lệnh JVM tùy chỉnh</value>
-  </data>
-  <data name="checkBox6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 271</value>
-  </data>
-  <data name="checkBox6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 17</value>
+    <value>Tùy chỉnh lệnh JVM</value>
  </data>
  <data name="checkBox6.Text" xml:space="preserve">
    <value>Chế độ gỡ lỗi</value>
@@ -142,72 +132,33 @@
  <data name="themeComboBox.Items2" xml:space="preserve">
    <value>Tối</value>
  </data>
-  <data name="themeComboBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>275, 243</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 244</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>57, 13</value>
-  </data>
  <data name="label1.Text" xml:space="preserve">
    <value>Giao diện</value>
  </data>
-  <data name="customApkToolTxtBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 216</value>
-  </data>
-  <data name="customApktoolBtn.Location" type="System.Drawing.Point, System.Drawing">
-    <value>483, 216</value>
-  </data>
-  <data name="useCustomApktoolChk.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 218</value>
-  </data>
-  <data name="useCustomApktoolChk.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 17</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="useCustomApktoolChk.TabIndex" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
  </data>
  <data name="useCustomApktoolChk.Text" xml:space="preserve">
    <value>Vị trí apktool tùy chỉnh</value>
  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>391, 26</value>
-  </data>
  <data name="label6.Text" xml:space="preserve">
-    <value>Việc di chuyển tệp trong quá trình thao tác vào thư mục tạm cần thời gian,
-vui lòng kiên nhẫn chờ đợi</value>
-  </data>
-  <data name="checkBox5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>294, 17</value>
+    <value>Việc di chuyển các tệp trong quá trình xử lý vào thư mục tạm có thể mất thời gian, vui lòng kiên nhẫn chờ đợi</value>
  </data>
  <data name="checkBox5.Text" xml:space="preserve">
-    <value>Hỗ trợ tên tệp UTF-8, bật để giải quyết lỗi tiếng Việt</value>
-  </data>
-  <data name="checkBox4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>125, 17</value>
+    <value>Hỗ trợ tên tệp UTF-8 (bật khi tên tệp bị lỗi hiển thị)</value>
  </data>
  <data name="checkBox4.Text" xml:space="preserve">
    <value>Vị trí Java tùy chỉnh</value>
  </data>
-  <data name="checkBox3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>174, 17</value>
-  </data>
  <data name="checkBox3.Text" xml:space="preserve">
-    <value>Vị trí bộ nhớ cache tùy chỉnh</value>
-  </data>
-  <data name="checkBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>123, 17</value>
+    <value>Vị trí bộ đệm tùy chỉnh</value>
  </data>
  <data name="checkBox2.Text" xml:space="preserve">
-    <value>Âm thanh hoàn tất</value>
-  </data>
-  <data name="checkBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 17</value>
+    <value>Âm báo hoàn thành</value>
  </data>
  <data name="checkBox1.Text" xml:space="preserve">
-    <value>Xóa nhật ký trước khi thực hiện thao tác</value>
-  </data>
-  <data name="checkBoxCheckUpdateStartup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>191, 17</value>
+    <value>Xóa nhật ký trước khi thực hiện</value>
  </data>
  <data name="checkBoxCheckUpdateStartup.Text" xml:space="preserve">
    <value>Kiểm tra cập nhật khi khởi động</value>
@@ -218,14 +169,11 @@ vui lòng kiên nhẫn chờ đợi</value>
  <data name="groupBoxLanguage.Text" xml:space="preserve">
    <value>Ngôn ngữ</value>
  </data>
-  <data name="ignoreOutputContextMenuBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>310, 17</value>
-  </data>
  <data name="ignoreOutputContextMenuBox.Text" xml:space="preserve">
-    <value>Bỏ qua thư mục đầu ra tùy chỉnh trong menu ngữ cảnh</value>
+    <value>Bỏ qua thư mục đầu ra tùy chỉnh của menu chuột phải</value>
  </data>
  <data name="labelAdminRights.Text" xml:space="preserve">
-    <value>Cần quyền quản trị viên</value>
+    <value>Yêu cầu quyền quản trị</value>
  </data>
  <data name="buttonAddContextMenu.Text" xml:space="preserve">
    <value>Cài đặt</value>
@@ -234,7 +182,7 @@ vui lòng kiên nhẫn chờ đợi</value>
    <value>Gỡ cài đặt</value>
  </data>
  <data name="groupBoxContextMenu.Text" xml:space="preserve">
-    <value>Menu ngữ cảnh</value>
+    <value>Menu chuột phải</value>
  </data>
  <data name="tabPage1.Text" xml:space="preserve">
    <value>Chung</value>
@@ -248,4 +196,4 @@ vui lòng kiên nhẫn chờ đợi</value>
  <data name="$this.Text" xml:space="preserve">
    <value>Cài đặt</value>
  </data>
-</root>
+</root>
@@ -16,25 +16,25 @@ namespace APKToolGUI.Handlers
        public AdbControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.killAdbBtn.Click += killAdbBtn_Click;
-            main.installApkBtn.Click += installApkBtn_Click;
-            main.refreshDevicesBtn.Click += refreshDevicesBtn_Click;
-            main.selApkAdbBtn.Click += selApkAdbBtn_Click;
-            main.devicesListBox.SelectedValueChanged += devicesListBox_SelectedValueChanged;
-            main.overrideAbiComboBox.SelectedIndexChanged += ComboBoxChanged;
+            main.killAdbBtn.Click += KillAdbBtn_Click;
+            main.installApkBtn.Click += InstallApkBtn_Click;
+            main.refreshDevicesBtn.Click += RefreshDevicesBtn_Click;
+            main.selApkAdbBtn.Click += SelApkAdbBtn_Click;
+            main.devicesListBox.SelectedValueChanged += DevicesListBox_SelectedValueChanged;
+            main.overrideAbiComboBox.SelectedIndexChanged += OverrideAbiComboBox_SelectedIndexChanged;
        }

-        private void ComboBoxChanged(object sender, EventArgs e)
+        private void OverrideAbiComboBox_SelectedIndexChanged(object sender, EventArgs e)
        {
            Settings.Default.Adb_OverrideAbi = main.overrideAbiComboBox.SelectedIndex;
        }

-        private async void refreshDevicesBtn_Click(object sender, EventArgs e)
+        private async void RefreshDevicesBtn_Click(object sender, EventArgs e)
        {
            await main.ListDevices();
        }

-        private async void killAdbBtn_Click(object sender, EventArgs e)
+        private async void KillAdbBtn_Click(object sender, EventArgs e)
        {
            if (MessageBox.Show(Language.ConfirmKillingAdbServer, Application.ProductName, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
            {
@@ -43,7 +43,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        private async void installApkBtn_Click(object sender, EventArgs e)
+        private async void InstallApkBtn_Click(object sender, EventArgs e)
        {
            string inputFile = main.apkPathAdbTxtBox.Text;
            if (File.Exists(inputFile))
@@ -54,7 +54,7 @@ namespace APKToolGUI.Handlers
                MessageBox.Show(Language.ErrorSelectedFileNotExist, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
        }

-        private void selApkAdbBtn_Click(object sender, EventArgs e)
+        private void SelApkAdbBtn_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -65,7 +65,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        private void devicesListBox_SelectedValueChanged(object sender, EventArgs e)
+        private void DevicesListBox_SelectedValueChanged(object sender, EventArgs e)
        {
            main.ToLog(ApktoolEventType.None, String.Format(Language.DeviceSelected, main.devicesListBox.SelectedItem));
            main.selAdbDeviceLbl.Text = main.devicesListBox.GetItemText(main.devicesListBox.SelectedItem);
@@ -14,57 +14,57 @@ namespace APKToolGUI.Handlers
        public ApkinfoControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.selApkFileInfoBtn.Click += selApkFileInfoBtn_Click;
-            main.psLinkBtn.Click += psLinkBtn_Click;
-            main.apkComboLinkBtn.Click += apkComboLinkBtn_Click;
-            main.apkPureLinkBtn.Click += apkPureLinkBtn_Click;
-            main.apkGkLinkBtn.Click += apkGkLinkBtn_Click;
-            main.apkSupportLinkBtn.Click += apkSupportLinkBtn_Click;
-            main.apkMirrorLinkBtn.Click += apkMirrorLinkBtn_Click;
+            main.selApkFileInfoBtn.Click += SelApkFileInfoBtn_Click;
+            main.psLinkBtn.Click += PsLinkBtn_Click;
+            main.apkComboLinkBtn.Click += ApkComboLinkBtn_Click;
+            main.apkPureLinkBtn.Click += ApkPureLinkBtn_Click;
+            main.apkGkLinkBtn.Click += ApkGkLinkBtn_Click;
+            main.apkSupportLinkBtn.Click += ApkSupportLinkBtn_Click;
+            main.apkMirrorLinkBtn.Click += ApkMirrorLinkBtn_Click;
        }

-        private void selApkFileInfoBtn_Click(object sender, EventArgs e)
+        private async void SelApkFileInfoBtn_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
                if (ofd.ShowDialog() == DialogResult.OK)
                {
-                    main.GetApkInfo(ofd.FileName);
+                    await main.GetApkInfo(ofd.FileName);
                }
            }
        }

-        private void psLinkBtn_Click(object sender, EventArgs e)
+        private void PsLinkBtn_Click(object sender, EventArgs e)
        {
            if (main.aapt != null)
                Process.Start(main.aapt.PlayStoreLink);
        }

-        private void apkComboLinkBtn_Click(object sender, EventArgs e)
+        private void ApkComboLinkBtn_Click(object sender, EventArgs e)
        {
            if (main.aapt != null)
                Process.Start(main.aapt.ApkComboLink);
        }

-        private void apkPureLinkBtn_Click(object sender, EventArgs e)
+        private void ApkPureLinkBtn_Click(object sender, EventArgs e)
        {
            if (main.aapt != null)
                Process.Start(main.aapt.ApkPureLink);
        }

-        private void apkGkLinkBtn_Click(object sender, EventArgs e)
+        private void ApkGkLinkBtn_Click(object sender, EventArgs e)
        {
            if (main.aapt != null)
                Process.Start(main.aapt.ApkGkLink);
        }

-        private void apkSupportLinkBtn_Click(object sender, EventArgs e)
+        private void ApkSupportLinkBtn_Click(object sender, EventArgs e)
        {
            if (main.aapt != null)
                Process.Start(main.aapt.ApkSupportLink);
        }
        
-        private void apkMirrorLinkBtn_Click(object sender, EventArgs e)
+        private void ApkMirrorLinkBtn_Click(object sender, EventArgs e)
        {
            if (main.aapt != null)
                Process.Start(main.aapt.ApkMirrorLink);
@@ -19,12 +19,12 @@ namespace APKToolGUI.Handlers
        public BaksmaliControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.baksmaliBrowseOutputBtn.Click += baksmaliBrowseOutputBtn_Click;
-            main.baksmaliBrowseInputDexBtn.Click += baksmaliBrowseInputDexBtn_Click;
-            main.decSmaliBtn.Click += decSmaliBtn_Click;
+            main.baksmaliBrowseOutputBtn.Click += BaksmaliBrowseOutputBtn_Click;
+            main.baksmaliBrowseInputDexBtn.Click += BaksmaliBrowseInputDexBtn_Click;
+            main.decSmaliBtn.Click += DecSmaliBtn_Click;
        }

-        internal void baksmaliBrowseOutputBtn_Click(object sender, EventArgs e)
+        internal void BaksmaliBrowseOutputBtn_Click(object sender, EventArgs e)
        {
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
            dlg.ShowNewFolderButton = true;
@@ -35,7 +35,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void baksmaliBrowseInputDexBtn_Click(object sender, EventArgs e)
+        internal void BaksmaliBrowseInputDexBtn_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -46,7 +46,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal async void decSmaliBtn_Click(object sender, EventArgs e)
+        internal async void DecSmaliBtn_Click(object sender, EventArgs e)
        {
            if (main.baksmaliUseOutputChkBox.Checked)
            {
@@ -21,14 +21,14 @@ namespace APKToolGUI.Handlers
        public BuildControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.button_BUILD_BrowseAaptPath.Click += button_BUILD_BrowseAaptPath_Click;
-            main.button_BUILD_BrowseFrameDir.Click += button_BUILD_BrowseFrameDir_Click;
-            main.button_BUILD_BrowseOutputAppPath.Click += button_BUILD_BrowseOutputAppPath_Click;
-            main.button_BUILD_BrowseInputProjectDir.Click += button_BUILD_BrowseInputProjectDir_Click;
-            main.button_BUILD_Build.Click += button_BUILD_Build_Click;
+            main.button_BUILD_BrowseAaptPath.Click += Button_BUILD_BrowseAaptPath_Click;
+            main.button_BUILD_BrowseFrameDir.Click += Button_BUILD_BrowseFrameDir_Click;
+            main.button_BUILD_BrowseOutputAppPath.Click += Button_BUILD_BrowseOutputAppPath_Click;
+            main.button_BUILD_BrowseInputProjectDir.Click += Button_BUILD_BrowseInputProjectDir_Click;
+            main.button_BUILD_Build.Click += Button_BUILD_Build_Click;
        }

-        internal void button_BUILD_BrowseAaptPath_Click(object sender, EventArgs e)
+        internal void Button_BUILD_BrowseAaptPath_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -43,7 +43,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_BUILD_BrowseFrameDir_Click(object sender, EventArgs e)
+        internal void Button_BUILD_BrowseFrameDir_Click(object sender, EventArgs e)
        {
            using (VistaFolderBrowserDialog fbd = new VistaFolderBrowserDialog())
            {
@@ -54,7 +54,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_BUILD_BrowseOutputAppPath_Click(object sender, EventArgs e)
+        internal void Button_BUILD_BrowseOutputAppPath_Click(object sender, EventArgs e)
        {
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
            dlg.ShowNewFolderButton = true;
@@ -65,7 +65,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_BUILD_BrowseInputProjectDir_Click(object sender, EventArgs e)
+        internal void Button_BUILD_BrowseInputProjectDir_Click(object sender, EventArgs e)
        {
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
            dlg.ShowNewFolderButton = true;
@@ -76,7 +76,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal async void button_BUILD_Build_Click(object sender, EventArgs e)
+        internal async void Button_BUILD_Build_Click(object sender, EventArgs e)
        {
            string decApkDir = main.textBox_BUILD_InputProjectDir.Text;
            if (Directory.Exists(main.textBox_BUILD_InputProjectDir.Text))
@@ -19,13 +19,13 @@ namespace APKToolGUI.Handlers
        public DecodeControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.button_DECODE_BrowseFrameDir.Click += button_DECODE_BrowseFrameDir_Click;
-            main.button_DECODE_BrowseOutputDirectory.Click += button_DECODE_BrowseOutputDirectory_Click;
-            main.button_DECODE_BrowseInputAppPath.Click += button_DECODE_BrowseInputAppPath_Click;
-            main.button_DECODE_Decode.Click += button_DECODE_Decode_Click;
+            main.button_DECODE_BrowseFrameDir.Click += Button_DECODE_BrowseFrameDir_Click;
+            main.button_DECODE_BrowseOutputDirectory.Click += Button_DECODE_BrowseOutputDirectory_Click;
+            main.button_DECODE_BrowseInputAppPath.Click += Button_DECODE_BrowseInputAppPath_Click;
+            main.button_DECODE_Decode.Click += Button_DECODE_Decode_Click;
        }

-        internal void button_DECODE_BrowseFrameDir_Click(object sender, EventArgs e)
+        internal void Button_DECODE_BrowseFrameDir_Click(object sender, EventArgs e)
        {
            using (VistaFolderBrowserDialog fbd = new VistaFolderBrowserDialog())
            {
@@ -36,7 +36,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_DECODE_BrowseOutputDirectory_Click(object sender, EventArgs e)
+        internal void Button_DECODE_BrowseOutputDirectory_Click(object sender, EventArgs e)
        {
            using (VistaFolderBrowserDialog fbd = new VistaFolderBrowserDialog())
            {
@@ -50,18 +50,18 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_DECODE_BrowseInputAppPath_Click(object sender, EventArgs e)
+        internal async void Button_DECODE_BrowseInputAppPath_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
-                ofd.Filter = "Android Package (*.apk;*.xapk;*.zip*.apkm;*.apks)|*.apk;*.xapk;*.zip*.apkm;*.apks";
+                ofd.Filter = "Android Package (*.apk;*.xapk;*.zip;*.apkm;*.apks)|*.apk;*.xapk;*.zip;*.apkm;*.apks";

                if (ofd.ShowDialog() == DialogResult.OK)
                {
                    main.textBox_DECODE_InputAppPath.Text = ofd.FileName;

                    if (!Settings.Default.Decode_DontParseApkInfo)
-                        main.GetApkInfo(ofd.FileName);
+                        await main.GetApkInfo(ofd.FileName);

                    if (main.checkBox_DECODE_OutputDirectory.Checked)
                    {
@@ -71,7 +71,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal async void button_DECODE_Decode_Click(object sender, EventArgs e)
+        internal async void Button_DECODE_Decode_Click(object sender, EventArgs e)
        {
            string inputFile = main.textBox_DECODE_InputAppPath.Text;
            if (File.Exists(inputFile))
@@ -203,14 +203,14 @@ namespace APKToolGUI.Handlers
            }
        }

-        private void DropApkToGetInfo(DragEventArgs e)
+        private async void DropApkToGetInfo(DragEventArgs e)
        {
            string apkFile = null;
            if (e.DropOneByEnd(file => apkFile = file, apks))
            {
-                main.smaliBrowseInputDirTxtBox.Text = apkFile;
+                main.fileTxtBox.Text = apkFile;
                main.basicInfoTabPage.BackColor = PanelBackColor();
-                main.GetApkInfo(apkFile);
+                await main.GetApkInfo(apkFile);
            }
        }

@@ -20,14 +20,14 @@ namespace APKToolGUI.Handlers
        public FrameworkControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.button_IF_BrowseFrameDir.Click += button_IF_BrowseFrameDir_Click;
-            main.button_IF_BrowseInputFramePath.Click += button_IF_BrowseInputFramePath_Click;
-            main.button_IF_InstallFramework.Click += button_IF_InstallFramework_Click;
-            main.clearFwBtn.Click += clearFwBtn_Click;
-            main.openFwFolderBtn.Click += openFwFolderBtn_Click;
+            main.button_IF_BrowseFrameDir.Click += Button_IF_BrowseFrameDir_Click;
+            main.button_IF_BrowseInputFramePath.Click += Button_IF_BrowseInputFramePath_Click;
+            main.button_IF_InstallFramework.Click += Button_IF_InstallFramework_Click;
+            main.clearFwBtn.Click += ClearFwBtn_Click;
+            main.openFwFolderBtn.Click += OpenFwFolderBtn_Click;
        }

-        internal void button_IF_BrowseFrameDir_Click(object sender, EventArgs e)
+        internal void Button_IF_BrowseFrameDir_Click(object sender, EventArgs e)
        {
            main.clearFwBeforeDecodeChkBox.Checked = false;
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
@@ -39,7 +39,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_IF_BrowseInputFramePath_Click(object sender, EventArgs e)
+        internal void Button_IF_BrowseInputFramePath_Click(object sender, EventArgs e)
        {
            main.clearFwBeforeDecodeChkBox.Checked = false;
            using (OpenFileDialog ofd = new OpenFileDialog())
@@ -56,7 +56,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal async void button_IF_InstallFramework_Click(object sender, EventArgs e)
+        internal async void Button_IF_InstallFramework_Click(object sender, EventArgs e)
        {
            if (main.checkBox_IF_FramePath.Checked)
            {
@@ -89,14 +89,14 @@ namespace APKToolGUI.Handlers
            });
        }

-        internal async void clearFwBtn_Click(object sender, EventArgs e)
+        internal async void ClearFwBtn_Click(object sender, EventArgs e)
        {
            main.Running(Language.ClearingFramework);

            await main.ClearFramework();
        }

-        internal void openFwFolderBtn_Click(object sender, EventArgs e)
+        internal void OpenFwFolderBtn_Click(object sender, EventArgs e)
        {
            if (main.checkBox_IF_FramePath.Checked && Directory.Exists(main.textBox_IF_FrameDir.Text))
                Process.Start("explorer.exe", main.textBox_IF_FrameDir.Text);
@@ -15,26 +15,26 @@ namespace APKToolGUI.Handlers
        public MainWindowEventHandlers(FormMain Main)
        {
            main = Main;
-            main.clearLogToolStripMenuItem.Click += clearLogToolStripMenuItem_Click;
-            main.copyToolStripMenuItem.Click += copyToolStripMenuItem_Click;
-            main.openAndroidMainfestBtn.Click += openAndroidMainfestBtn_Click;
-            main.openApktoolYmlBtn.Click += openApktoolYmlBtn_Click;
-            main.compileOutputOpenDirBtn.Click += compiledApkOpenDirBtn_Click;
-            main.button_OpenMainActivity.Click += button_OpenMainActivity_Click;
-            main.decApkOpenDirBtn.Click += decApkOpenDirBtn_Click;
-            main.decOutOpenDirBtn.Click += decOutOpenDirBtn_Click;
-            main.comApkOpenDir.Click += comApkOpenDir_Click;
-            main.signApkOpenDirBtn.Click += signApkOpenDirBtn_Click;
-            main.alignApkOpenDirBtn.Click += alignApkOpenDirBtn_Click;
-            main.mergeApkBtn.Click += mergeApkBtn_Click;
-            main.selSplitApkBtn.Click += selSplitApkBtn_Click;
+            main.clearLogToolStripMenuItem.Click += ClearLogToolStripMenuItem_Click;
+            main.copyToolStripMenuItem.Click += CopyToolStripMenuItem_Click;
+            main.openAndroidMainfestBtn.Click += OpenAndroidMainfestBtn_Click;
+            main.openApktoolYmlBtn.Click += OpenApktoolYmlBtn_Click;
+            main.compileOutputOpenDirBtn.Click += CompiledApkOpenDirBtn_Click;
+            main.button_OpenMainActivity.Click += Button_OpenMainActivity_Click;
+            main.decApkOpenDirBtn.Click += DecApkOpenDirBtn_Click;
+            main.decOutOpenDirBtn.Click += DecOutOpenDirBtn_Click;
+            main.comApkOpenDir.Click += ComApkOpenDir_Click;
+            main.signApkOpenDirBtn.Click += SignApkOpenDirBtn_Click;
+            main.alignApkOpenDirBtn.Click += AlignApkOpenDirBtn_Click;
+            main.mergeApkBtn.Click += MergeApkBtn_Click;
+            main.selSplitApkBtn.Click += SelSplitApkBtn_Click;
        }

-        internal void selSplitApkBtn_Click(object sender, EventArgs e)
+        internal void SelSplitApkBtn_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
-                ofd.Filter = "Split APK Package (*.xapk;*.zip*.apkm;*.apks)|*.xapk;*.zip*.apkm;*.apks";
+                ofd.Filter = "Split APK Package (*.xapk;*.zip;*.apkm;*.apks)|*.xapk;*.zip;*.apkm;*.apks";

                if (ofd.ShowDialog() == DialogResult.OK)
                {
@@ -43,7 +43,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal async void mergeApkBtn_Click(object sender, EventArgs e)
+        internal async void MergeApkBtn_Click(object sender, EventArgs e)
        {
            try
            {
@@ -62,12 +62,12 @@ namespace APKToolGUI.Handlers
            }
        }

-        private void clearLogToolStripMenuItem_Click(object sender, EventArgs e)
+        private void ClearLogToolStripMenuItem_Click(object sender, EventArgs e)
        {
            main.logTxtBox.Text = "";
        }

-        private void copyToolStripMenuItem_Click(object sender, EventArgs e)
+        private void CopyToolStripMenuItem_Click(object sender, EventArgs e)
        {
            try
            {
@@ -79,7 +79,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void decApkOpenDirBtn_Click(object sender, EventArgs e)
+        internal void DecApkOpenDirBtn_Click(object sender, EventArgs e)
        {
            if (Directory.Exists(main.textBox_BUILD_InputProjectDir.Text))
                Process.Start("explorer.exe", main.textBox_BUILD_InputProjectDir.Text);
@@ -89,7 +89,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void decOutOpenDirBtn_Click(object sender, EventArgs e)
+        internal void DecOutOpenDirBtn_Click(object sender, EventArgs e)
        {
            if (Directory.Exists(Settings.Default.Decode_OutputDir))
                Process.Start("explorer.exe", Settings.Default.Decode_OutputDir);
@@ -99,7 +99,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        private void openAndroidMainfestBtn_Click(object sender, EventArgs e)
+        private void OpenAndroidMainfestBtn_Click(object sender, EventArgs e)
        {
            if (File.Exists(Path.Combine(main.textBox_BUILD_InputProjectDir.Text, "AndroidManifest.xml")))
                Process.Start("explorer.exe", Path.Combine(main.textBox_BUILD_InputProjectDir.Text, "AndroidManifest.xml"));
@@ -107,7 +107,7 @@ namespace APKToolGUI.Handlers
                main.ToLog(ApktoolEventType.Error, Language.AndroidManifestNotExist);
        }

-        private void openApktoolYmlBtn_Click(object sender, EventArgs e)
+        private void OpenApktoolYmlBtn_Click(object sender, EventArgs e)
        {
            if (File.Exists(Path.Combine(main.textBox_BUILD_InputProjectDir.Text, "apktool.yml")))
                Process.Start("explorer.exe", Path.Combine(main.textBox_BUILD_InputProjectDir.Text, "apktool.yml"));
@@ -115,7 +115,7 @@ namespace APKToolGUI.Handlers
                main.ToLog(ApktoolEventType.Error, Language.AndroidManifestNotExist);
        }

-        private void compiledApkOpenDirBtn_Click(object sender, EventArgs e)
+        private void CompiledApkOpenDirBtn_Click(object sender, EventArgs e)
        {
            if (Directory.Exists(Settings.Default.Build_OutputAppPath))
            {
@@ -125,7 +125,7 @@ namespace APKToolGUI.Handlers
                main.ToLog(ApktoolEventType.Error, Language.ErrorSelectedFileNotExist);
        }

-        private void button_OpenMainActivity_Click(object sender, EventArgs e)
+        private void Button_OpenMainActivity_Click(object sender, EventArgs e)
        {
            string decPath = main.textBox_BUILD_InputProjectDir.Text;
            if (Directory.Exists(decPath))
@@ -177,7 +177,7 @@ namespace APKToolGUI.Handlers
                main.ToLog(ApktoolEventType.Error, Language.DecompiledAPKNotExist);
        }

-        internal void comApkOpenDir_Click(object sender, EventArgs e)
+        internal void ComApkOpenDir_Click(object sender, EventArgs e)
        {
            string decApkDir = main.textBox_BUILD_InputProjectDir.Text;

@@ -199,11 +199,11 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void signApkOpenDirBtn_Click(object sender, EventArgs e)
+        internal void SignApkOpenDirBtn_Click(object sender, EventArgs e)
        {
            string inputFile = Settings.Default.Sign_InputFile;
            string outputFile = inputFile;
-            if (Settings.Default.Zipalign_UseOutputDir)
+            if (Settings.Default.Sign_UseOutputDir)
                outputFile = Path.Combine(Settings.Default.Sign_OutputDir, Path.GetFileName(inputFile));

            if (File.Exists(outputFile))
@@ -214,7 +214,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void alignApkOpenDirBtn_Click(object sender, EventArgs e)
+        internal void AlignApkOpenDirBtn_Click(object sender, EventArgs e)
        {
            string inputFile = Settings.Default.Zipalign_InputFile;

@@ -18,24 +18,24 @@ namespace APKToolGUI.Handlers
        public MenuItemHandlers(FormMain Main)
        {
            main = Main;
-            main.saveLogToFileToolStripMenuItem.Click += saveLogItem_Click;
-            main.settingsToolStripMenuItem.Click += menuItemSettings_Click;
-            main.exitToolStripMenuItem.Click += menuItemExit_Click;
-            main.openTempFolderToolStripMenuItem.Click += openTempFolderToolStripMenuItem_Click;
-            main.checkForUpdateToolStripMenuItem.Click += menuItemCheckUpdate_Click;
-            main.aboutToolStripMenuItem.Click += menuItemAbout_Click;
-            main.apktoolIssuesToolStripMenuItem.Click += apktoolIssuesLinkItem_Click;
-            main.baksmaliIssuesToolStripMenuItem.Click += baksmaliIssuesLinkItem_Click;
-            main.reportAnIsuueToolStripMenuItem.Click += reportAnIsuueToolStripMenuItem_Click;
-            main.newInsToolStripMenuItem.Click += newInsToolStripMenuItem_Click;
+            main.saveLogToFileToolStripMenuItem.Click += SaveLogItem_Click;
+            main.settingsToolStripMenuItem.Click += MenuItemSettings_Click;
+            main.exitToolStripMenuItem.Click += MenuItemExit_Click;
+            main.openTempFolderToolStripMenuItem.Click += OpenTempFolderToolStripMenuItem_Click;
+            main.checkForUpdateToolStripMenuItem.Click += MenuItemCheckUpdate_Click;
+            main.aboutToolStripMenuItem.Click += MenuItemAbout_Click;
+            main.apktoolIssuesToolStripMenuItem.Click += ApktoolIssuesLinkItem_Click;
+            main.baksmaliIssuesToolStripMenuItem.Click += BaksmaliIssuesLinkItem_Click;
+            main.reportAnIsuueToolStripMenuItem.Click += ReportAnIsuueToolStripMenuItem_Click;
+            main.newInsToolStripMenuItem.Click += NewInsToolStripMenuItem_Click;
        }

-        private void newInsToolStripMenuItem_Click(object sender, EventArgs e)
+        private void NewInsToolStripMenuItem_Click(object sender, EventArgs e)
        {
            Process.Start(System.Reflection.Assembly.GetExecutingAssembly().Location);
        }

-        private void saveLogItem_Click(object sender, EventArgs e)
+        private void SaveLogItem_Click(object sender, EventArgs e)
        {
            using (var sfd = new SaveFileDialog())
            {
@@ -50,7 +50,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        private void menuItemSettings_Click(object sender, EventArgs e)
+        private void MenuItemSettings_Click(object sender, EventArgs e)
        {
            Theme theme = (Theme)Settings.Default.Theme;

@@ -64,12 +64,12 @@ namespace APKToolGUI.Handlers
            frm.ShowDialog();
        }

-        private void menuItemExit_Click(object sender, EventArgs e)
+        private void MenuItemExit_Click(object sender, EventArgs e)
        {
            Application.Exit();
        }

-        private void openTempFolderToolStripMenuItem_Click(object sender, EventArgs e)
+        private void OpenTempFolderToolStripMenuItem_Click(object sender, EventArgs e)
        {
            if (Directory.Exists(Program.TEMP_PATH))
                Process.Start("explorer.exe", Program.TEMP_PATH);
@@ -80,12 +80,12 @@ namespace APKToolGUI.Handlers
            }
        }

-        private void menuItemCheckUpdate_Click(object sender, EventArgs e)
+        private void MenuItemCheckUpdate_Click(object sender, EventArgs e)
        {
            main.updateCheker.CheckAsync();
        }

-        private void menuItemAbout_Click(object sender, EventArgs e)
+        private void MenuItemAbout_Click(object sender, EventArgs e)
        {
            Theme theme = (Theme)Settings.Default.Theme;

@@ -98,17 +98,17 @@ namespace APKToolGUI.Handlers
            frm.ShowDialog();
        }

-        private void apktoolIssuesLinkItem_Click(object sender, EventArgs e)
+        private void ApktoolIssuesLinkItem_Click(object sender, EventArgs e)
        {
            Process.Start("https://github.com/iBotPeaches/Apktool/issues?q=is%3Aissue");
        }

-        private void baksmaliIssuesLinkItem_Click(object sender, EventArgs e)
+        private void BaksmaliIssuesLinkItem_Click(object sender, EventArgs e)
        {
            Process.Start("https://github.com/JesusFreke/smali/issues?q=is%3Aissue");
        }

-        private void reportAnIsuueToolStripMenuItem_Click(object sender, EventArgs e)
+        private void ReportAnIsuueToolStripMenuItem_Click(object sender, EventArgs e)
        {
            Process.Start("https://github.com/AndnixSH/APKToolGUI/issues/new/choose");
        }
@@ -22,20 +22,19 @@ namespace APKToolGUI.Handlers
        public SignControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.button_SIGN_BrowsePublicKey.Click += button_SIGN_BrowsePublicKey_Click;
-            main.button_SIGN_BrowsePrivateKey.Click += button_SIGN_BrowsePrivateKey_Click;
-            main.button_SIGN_BrowsePrivateKey.Click += button_SIGN_BrowsePrivateKey_Click;
-            main.button_SIGN_BrowseInputFile.Click += button_SIGN_BrowseInputFile_Click;
-            main.button_SIGN_BrowseOutputFile.Click += button_SIGN_BrowseOutputFile_Click;
-            main.schemev1ComboBox.SelectedIndexChanged += schemeComboBoxChanged;
-            main.schemev2ComboBox.SelectedIndexChanged += schemeComboBoxChanged;
-            main.schemev3ComboBox.SelectedIndexChanged += schemeComboBoxChanged;
-            main.schemev4ComboBox.SelectedIndexChanged += schemeComboBoxChanged;
-            main.button_SIGN_Sign.Click += button_SIGN_Sign_Click;
-            main.selectKeyStoreFileBtn.Click += selectKeyStoreFileBtn_Click;
+            main.button_SIGN_BrowsePublicKey.Click += Button_SIGN_BrowsePublicKey_Click;
+            main.button_SIGN_BrowsePrivateKey.Click += Button_SIGN_BrowsePrivateKey_Click;
+            main.button_SIGN_BrowseInputFile.Click += Button_SIGN_BrowseInputFile_Click;
+            main.button_SIGN_BrowseOutputFile.Click += Button_SIGN_BrowseOutputFile_Click;
+            main.schemev1ComboBox.SelectedIndexChanged += SchemeComboBox_SelectedIndexChanged;
+            main.schemev2ComboBox.SelectedIndexChanged += SchemeComboBox_SelectedIndexChanged;
+            main.schemev3ComboBox.SelectedIndexChanged += SchemeComboBox_SelectedIndexChanged;
+            main.schemev4ComboBox.SelectedIndexChanged += SchemeComboBox_SelectedIndexChanged;
+            main.button_SIGN_Sign.Click += Button_SIGN_Sign_Click;
+            main.selectKeyStoreFileBtn.Click += SelectKeyStoreFileBtn_Click;
        }

-        internal void button_SIGN_BrowsePublicKey_Click(object sender, EventArgs e)
+        internal void Button_SIGN_BrowsePublicKey_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -50,7 +49,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_SIGN_BrowsePrivateKey_Click(object sender, EventArgs e)
+        internal void Button_SIGN_BrowsePrivateKey_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -65,7 +64,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_SIGN_BrowseOutputFile_Click(object sender, EventArgs e)
+        internal void Button_SIGN_BrowseOutputFile_Click(object sender, EventArgs e)
        {
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
            dlg.ShowNewFolderButton = true;
@@ -76,7 +75,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_SIGN_BrowseInputFile_Click(object sender, EventArgs e)
+        internal async void Button_SIGN_BrowseInputFile_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -85,7 +84,7 @@ namespace APKToolGUI.Handlers
                if (ofd.ShowDialog() == DialogResult.OK)
                {
                    main.textBox_SIGN_InputFile.Text = ofd.FileName;
-                    main.GetApkInfo(ofd.FileName);
+                    await main.GetApkInfo(ofd.FileName);
                    main.textBox_SIGN_OutputFile.Text =
                        String.Format("{0}{1}{2}_signed{3}",
                        Path.GetDirectoryName(main.textBox_SIGN_InputFile.Text),
@@ -96,7 +95,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal async void button_SIGN_Sign_Click(object sender, EventArgs e)
+        internal async void Button_SIGN_Sign_Click(object sender, EventArgs e)
        {
            try
            {
@@ -125,7 +124,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void selectKeyStoreFileBtn_Click(object sender, EventArgs e)
+        internal void SelectKeyStoreFileBtn_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -135,7 +134,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        private void schemeComboBoxChanged(object sender, EventArgs e)
+        private void SchemeComboBox_SelectedIndexChanged(object sender, EventArgs e)
        {
            Settings.Default.Sign_Schemev1 = main.schemev1ComboBox.SelectedIndex;
            Settings.Default.Sign_Schemev2 = main.schemev2ComboBox.SelectedIndex;
@@ -19,12 +19,12 @@ namespace APKToolGUI.Handlers
        public SmaliControlEventHandlers(FormMain Main)
        {
            main = Main;
-            main.smaliBrowseOutputBtn.Click += smaliBrowseOutputBtn_Click;
-            main.smaliBrowseInputDirBtn.Click += smaliBrowseInputDirBtn_Click;
-            main.comSmaliBtn.Click += comSmaliBtn_Click;
+            main.smaliBrowseOutputBtn.Click += SmaliBrowseOutputBtn_Click;
+            main.smaliBrowseInputDirBtn.Click += SmaliBrowseInputDirBtn_Click;
+            main.comSmaliBtn.Click += ComSmaliBtn_Click;
        }

-        internal void smaliBrowseOutputBtn_Click(object sender, EventArgs e)
+        internal void SmaliBrowseOutputBtn_Click(object sender, EventArgs e)
        {
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
            dlg.ShowNewFolderButton = true;
@@ -35,7 +35,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void smaliBrowseInputDirBtn_Click(object sender, EventArgs e)
+        internal void SmaliBrowseInputDirBtn_Click(object sender, EventArgs e)
        {
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
            dlg.ShowNewFolderButton = true;
@@ -46,7 +46,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void comSmaliBtn_Click(object sender, EventArgs e)
+        internal async void ComSmaliBtn_Click(object sender, EventArgs e)
        {
            if (main.smaliUseOutputChkBox.Checked)
            {
@@ -63,7 +63,7 @@ namespace APKToolGUI.Handlers
                return;
            }

-            main.Smali(Settings.Default.Smali_InputDir);
+            await main.Smali(Settings.Default.Smali_InputDir);
        }
    }
 }
@@ -21,10 +21,10 @@ namespace APKToolGUI.Handlers
        {
            main = Main;
            CheckAlignSwitch = !Settings.Default.Zipalign_CheckOnly;
-            main.checkBox_ZIPALIGN_CheckAlignment.Click += checkBox_ZIPALIGN_CheckAlignment_CheckedChanged;
-            main.button_ZIPALIGN_BrowseOutputFile.Click += button_ZIPALIGN_BrowseOutputFile_Click;
-            main.button_ZIPALIGN_BrowseInputFile.Click += button_ZIPALIGN_BrowseInputFile_Click;
-            main.button_ZIPALIGN_Align.Click += button_ZIPALIGN_Align_Click;
+            main.checkBox_ZIPALIGN_CheckAlignment.Click += CheckBox_ZIPALIGN_CheckAlignment_CheckedChanged;
+            main.button_ZIPALIGN_BrowseOutputFile.Click += Button_ZIPALIGN_BrowseOutputFile_Click;
+            main.button_ZIPALIGN_BrowseInputFile.Click += Button_ZIPALIGN_BrowseInputFile_Click;
+            main.button_ZIPALIGN_Align.Click += Button_ZIPALIGN_Align_Click;
        }

        internal bool CheckAlignSwitch
@@ -36,12 +36,12 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void checkBox_ZIPALIGN_CheckAlignment_CheckedChanged(object sender, EventArgs e)
+        internal void CheckBox_ZIPALIGN_CheckAlignment_CheckedChanged(object sender, EventArgs e)
        {
            CheckAlignSwitch = !main.checkBox_ZIPALIGN_CheckAlignment.Checked;
        }

-        internal void button_ZIPALIGN_BrowseOutputFile_Click(object sender, EventArgs e)
+        internal void Button_ZIPALIGN_BrowseOutputFile_Click(object sender, EventArgs e)
        {
            VistaFolderBrowserDialog dlg = new VistaFolderBrowserDialog();
            dlg.ShowNewFolderButton = true;
@@ -52,7 +52,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal void button_ZIPALIGN_BrowseInputFile_Click(object sender, EventArgs e)
+        internal async void Button_ZIPALIGN_BrowseInputFile_Click(object sender, EventArgs e)
        {
            using (OpenFileDialog ofd = new OpenFileDialog())
            {
@@ -66,7 +66,7 @@ namespace APKToolGUI.Handlers
                if (ofd.ShowDialog() == DialogResult.OK)
                {
                    main.textBox_ZIPALIGN_InputFile.Text = ofd.FileName;
-                    main.GetApkInfo(ofd.FileName);
+                    await main.GetApkInfo(ofd.FileName);
                    if (!main.checkBox_ZIPALIGN_CheckAlignment.Checked)
                        main.textBox_ZIPALIGN_OutputFile.Text = String.Format("{0}\\{1}_zipaligned{2}",
                            Path.GetDirectoryName(ofd.FileName),
@@ -76,7 +76,7 @@ namespace APKToolGUI.Handlers
            }
        }

-        internal async void button_ZIPALIGN_Align_Click(object sender, EventArgs e)
+        internal async void Button_ZIPALIGN_Align_Click(object sender, EventArgs e)
        {
            if (!File.Exists(main.textBox_ZIPALIGN_InputFile.Text))
            {
@@ -1,8 +0,0 @@
-<linker>
-  <assembly fullname="System.Diagnostics.DiagnosticSource">
-    <type fullname="System.Diagnostics.Metrics.MetricsEventSource">
-      <!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
-      <method name="GetInstance" />
-    </type>
-  </assembly>
-</linker>
@@ -14,7 +14,7 @@ namespace Java

        public JarProcess(string javaPath, string jarPath)
        {
-            JavaPath = javaPath.Equals("java") ? "" : javaPath;
+            JavaPath = string.IsNullOrWhiteSpace(javaPath) ? "java" : javaPath;
            JarPath = jarPath;
            Initialize();
        }
@@ -38,8 +38,9 @@ namespace Java
            if (Settings.Default.UseCustomJVMArgs)
                customArgs = Settings.Default.CustomJVMArgs;

-            StartInfo.Arguments = String.Format("-jar {0} \"{1}\" {2}", customArgs, JarPath, args);
-            Debug.WriteLine(String.Format("-jar {0} \"{1}\" {2}", customArgs, JarPath, args));
+            string jvmArgs = string.IsNullOrWhiteSpace(customArgs) ? string.Empty : customArgs.Trim() + " ";
+            StartInfo.Arguments = String.Format("{0}-jar \"{1}\" {2}", jvmArgs, JarPath, args);
+            Debug.WriteLine(StartInfo.Arguments);
            return base.Start();
        }

@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="About" xml:space="preserve">
+    <value>バージョン情報</value>
+  </data>
+  <data name="APKToolVersion" xml:space="preserve">
+    <value>Apktool のバージョン</value>
+  </data>
+  <data name="CheckForUpdate" xml:space="preserve">
+    <value>更新を確認する</value>
+  </data>
+  <data name="DebugMode" xml:space="preserve">
+    <value>デバッグモード</value>
+  </data>
+  <data name="Exit" xml:space="preserve">
+    <value>終了</value>
+  </data>
+  <data name="File" xml:space="preserve">
+    <value>ファイル</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>ヘルプ</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>設定</value>
+  </data>
+  <data name="ErrorJavaDetect" xml:space="preserve">
+    <value>Java がインストールされていないか、正しくインストールされていません。 Java をインストールするか、設定でカスタムの場所を設定してください。</value>
+  </data>
+  <data name="ErrorReadSettings" xml:space="preserve">
+    <value>設定の読み取りエラーです！</value>
+  </data>
+  <data name="UpdateNewVersion" xml:space="preserve">
+    <value>新しいバージョン利用可能です。 更新しますか？</value>
+  </data>
+  <data name="UpdateNoUpdates" xml:space="preserve">
+    <value>利用可能な更新はありません。</value>
+  </data>
+  <data name="WarningDecodingFolderNotSelected" xml:space="preserve">
+    <value>デコード先のフォルダーが未選択です！</value>
+  </data>
+  <data name="WarningFileForDecodingNotSelected" xml:space="preserve">
+    <value>デコードするファイルが未選択です！</value>
+  </data>
+  <data name="WarningFileForSigningNotSelected" xml:space="preserve">
+    <value>署名用のファイルが未選択です！</value>
+  </data>
+  <data name="WarningFrameworkNotSelected" xml:space="preserve">
+    <value>フレームワークが未選択です！</value>
+  </data>
+  <data name="ErrorSaveSettings" xml:space="preserve">
+    <value>設定の保存エラーです！</value>
+  </data>
+  <data name="NeedRestart" xml:space="preserve">
+    <value>設定を有効化するにはプログラムを再起動してください。 今すぐしますか？</value>
+  </data>
+  <data name="FileNotFound" xml:space="preserve">
+    <value>ファイルが見つかりません</value>
+  </data>
+  <data name="FolderNotExist" xml:space="preserve">
+    <value>フォルダーが存在しません</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>エラー</value>
+  </data>
+  <data name="Build" xml:space="preserve">
+    <value>ビルド</value>
+  </data>
+  <data name="Decode" xml:space="preserve">
+    <value>デコード</value>
+  </data>
+  <data name="InstallFramework" xml:space="preserve">
+    <value>フレームワークをインストール</value>
+  </data>
+  <data name="Sign" xml:space="preserve">
+    <value>署名</value>
+  </data>
+  <data name="SystemLanguage" xml:space="preserve">
+    <value>システムの言語</value>
+  </data>
+  <data name="DoYouRealyWantToInstallCM" xml:space="preserve">
+    <value>コンテキストメニューをインストールしますか？</value>
+  </data>
+  <data name="DoYouRealyWantToRemoveCM" xml:space="preserve">
+    <value>コンテキストメニューを削除しますか？</value>
+  </data>
+  <data name="Done" xml:space="preserve">
+    <value>完了</value>
+  </data>
+  <data name="CantDetectApktoolVersion" xml:space="preserve">
+    <value>apktool のバージョンを検出できません。</value>
+  </data>
+  <data name="DecompilingSuccessfullyCompleted" xml:space="preserve">
+    <value>デコンパイルが正常に完了しました。 出力先のディレクトリ: {0}</value>
+  </data>
+  <data name="ErrorUpdateChecking" xml:space="preserve">
+    <value>更新の確認でエラーが発生しました:</value>
+  </data>
+  <data name="SignSuccessfullyCompleted" xml:space="preserve">
+    <value>署名は正常に完了しました。 ファイルの保存先: {0}</value>
+  </data>
+  <data name="Aligning" xml:space="preserve">
+    <value>最適化中</value>
+  </data>
+  <data name="ErrorCompiling" xml:space="preserve">
+    <value>コンパイルに失敗しました</value>
+  </data>
+  <data name="ErrorEnteringFrameworkTag" xml:space="preserve">
+    <value>フレームワークタグの入力エラーです。</value>
+  </data>
+  <data name="ErrorSelectedFileNotExist" xml:space="preserve">
+    <value>選択したファイルは存在しません。</value>
+  </data>
+  <data name="ErrorSelectingFrameworkDirectory" xml:space="preserve">
+    <value>フレームワークディレクトリの選択中にエラーが発生しました。</value>
+  </data>
+  <data name="ErrorSelectingFrameworkFile" xml:space="preserve">
+    <value>フレームワークファイルの選択中にエラーが発生しました。 ファイルが存在しません。</value>
+  </data>
+  <data name="ErrorSigning" xml:space="preserve">
+    <value>署名に失敗しました。</value>
+  </data>
+  <data name="FrameworkInstallationNotStarted" xml:space="preserve">
+    <value>エラーが発生しました。 フレームワークのインストールが開始されていません。</value>
+  </data>
+  <data name="InstallingFramework" xml:space="preserve">
+    <value>フレームワークをインストール</value>
+  </data>
+  <data name="Signing" xml:space="preserve">
+    <value>署名</value>
+  </data>
+  <data name="SignInputFileNotFound" xml:space="preserve">
+    <value>入力先のファイルがありません。</value>
+  </data>
+  <data name="SignPrivateKeyNotFound" xml:space="preserve">
+    <value>秘密鍵がありません。</value>
+  </data>
+  <data name="SignPublicKeyNotFound" xml:space="preserve">
+    <value>公開鍵がありません。</value>
+  </data>
+  <data name="ZIPArchives" xml:space="preserve">
+    <value>ZIP アーカイブ</value>
+  </data>
+  <data name="DecodeCouldNotCreate" xml:space="preserve">
+    <value>無効な文字が含まれているため、選択したデコンパイルディレクトリを作成できませんでした。</value>
+  </data>
+  <data name="DecodeDirNotSelected" xml:space="preserve">
+    <value>デコンパイルディレクトリが未選択です。</value>
+  </data>
+  <data name="DecodeSelectedFrameworkNotExist" xml:space="preserve">
+    <value>選択したフレームワークディレクトリが存在しません。</value>
+  </data>
+  <data name="Decoding" xml:space="preserve">
+    <value>デコード中</value>
+  </data>
+  <data name="ErrorDecompiling" xml:space="preserve">
+    <value>デコンパイルに失敗しました</value>
+  </data>
+  <data name="ExecutableFile" xml:space="preserve">
+    <value>実行可能なファイル</value>
+  </data>
+  <data name="ChangedTargetSdkTo29" xml:space="preserve">
+    <value>ターゲット SDK を 29 に変更する</value>
+  </data>
+  <data name="ErrorVersionParsing" xml:space="preserve">
+    <value>バージョンの解析に失敗しました</value>
+  </data>
+  <data name="FixAndroidManifest" xml:space="preserve">
+    <value>AndroidManifest.xml を修正しました</value>
+  </data>
+  <data name="RemoveApkToolDummies" xml:space="preserve">
+    <value>すべての ApkTook ダミーを削除しました</value>
+  </data>
+  <data name="APKSelected" xml:space="preserve">
+    <value>選択した APK:</value>
+  </data>
+  <data name="ErrorSelectedFolderNotExist" xml:space="preserve">
+    <value>選択したフォルダーは存在しません。</value>
+  </data>
+  <data name="AndroidManifestNotExist" xml:space="preserve">
+    <value>AndroidManifest.xml が存在しません</value>
+  </data>
+  <data name="DecompiledAPKNotExist" xml:space="preserve">
+    <value>デコンパイルされた APK ディレクトリが存在しません</value>
+  </data>
+  <data name="MainActivityFound" xml:space="preserve">
+    <value>「{0}」でメインアクティビティが見つかりました</value>
+  </data>
+  <data name="MainActivityNotFoundPleaseFindManually" xml:space="preserve">
+    <value>メインアクティビティが見つかりませんでした。 手動で検索してください</value>
+  </data>
+  <data name="ClearingFramework" xml:space="preserve">
+    <value>フレームワークを消去</value>
+  </data>
+  <data name="CompilingSuccessfullyCompleted" xml:space="preserve">
+    <value>コンパイルが正常に完了しました。 出力先ディレクトリ: {0}</value>
+  </data>
+  <data name="ErrorZipalign" xml:space="preserve">
+    <value>Zipaligning に失敗しました</value>
+  </data>
+  <data name="ZipalignFileSavedTo" xml:space="preserve">
+    <value>Zipalign が正常に完了しました。 ファイルは「{0}」に保存されました</value>
+  </data>
+  <data name="ErrorClearingFw" xml:space="preserve">
+    <value>フレームワークの消去でエラーが発生しました</value>
+  </data>
+  <data name="FrameworkCacheCleared" xml:space="preserve">
+    <value>フレームワークキャッシュを消去しました</value>
+  </data>
+  <data name="AllDone" xml:space="preserve">
+    <value>すべて完了しました！</value>
+  </data>
+  <data name="FrameworkInstalled" xml:space="preserve">
+    <value>フレームワークが正常にインストールされました</value>
+  </data>
+  <data name="FrameworkDirNotExist" xml:space="preserve">
+    <value>フレームワークディレクトリが存在しません</value>
+  </data>
+  <data name="DecompilingDex" xml:space="preserve">
+    <value>DEX をデコンパイル中</value>
+  </data>
+  <data name="ErrorSelectedOutputFolderNotExist" xml:space="preserve">
+    <value>選択した出力先フォルダーが存在しません。</value>
+  </data>
+  <data name="CompilingDex" xml:space="preserve">
+    <value>DEX をコンパイル中</value>
+  </data>
+  <data name="DragDropNotSupported" xml:space="preserve">
+    <value>管理者として実行中です。 ドラッグ &amp; ドロップはサポートされていない可能性があります</value>
+  </data>
+  <data name="DragDropSupported" xml:space="preserve">
+    <value>ドラッグ &amp; ドロップはサポートされています</value>
+  </data>
+  <data name="ErrorNotAnApk" xml:space="preserve">
+    <value>このディレクトリは Android パッケージではありません</value>
+  </data>
+  <data name="Baksmali" xml:space="preserve">
+    <value>Baksmali</value>
+  </data>
+  <data name="Smali" xml:space="preserve">
+    <value>Smali</value>
+  </data>
+  <data name="Zipalign" xml:space="preserve">
+    <value>Zipalign</value>
+  </data>
+  <data name="CompileApk" xml:space="preserve">
+    <value>APK をコンパイル</value>
+  </data>
+  <data name="CompileDex" xml:space="preserve">
+    <value>DEX を組み立て</value>
+  </data>
+  <data name="DecompileApk" xml:space="preserve">
+    <value>APK をデコンパイル</value>
+  </data>
+  <data name="DecompileDex" xml:space="preserve">
+    <value>DEX を分解</value>
+  </data>
+  <data name="GetApkInfo" xml:space="preserve">
+    <value>APK 情報を表示</value>
+  </data>
+  <data name="NotDecompiledApk" xml:space="preserve">
+    <value>このフォルダーはデコンパイルされた APK ではありません</value>
+  </data>
+  <data name="NotDecompiledDex" xml:space="preserve">
+    <value>このフォルダーはデコンパイルされた DEX ではありません</value>
+  </data>
+  <data name="RequiredFilesMissing" xml:space="preserve">
+    <value>必要なファイルが見つかりません</value>
+  </data>
+  <data name="SignApk" xml:space="preserve">
+    <value>APK を署名</value>
+  </data>
+  <data name="TextFile" xml:space="preserve">
+    <value>テキストファイル</value>
+  </data>
+  <data name="ZipalignApk" xml:space="preserve">
+    <value>APK を最適化</value>
+  </data>
+  <data name="CreateUnsignedApk" xml:space="preserve">
+    <value>未署名の APK を作成</value>
+  </data>
+  <data name="MetainfNotExist" xml:space="preserve">
+    <value>META-INF フォルダーがありません。 スキップしました</value>
+  </data>
+  <data name="ErrorGettingApkInfo" xml:space="preserve">
+    <value>アプリ情報の取得中にエラーが発生しました</value>
+  </data>
+  <data name="InputDirectory" xml:space="preserve">
+    <value>入力先のディレクトリ: {0}</value>
+  </data>
+  <data name="InputFile" xml:space="preserve">
+    <value>入力ファイル: {0}</value>
+  </data>
+  <data name="DeleteFile" xml:space="preserve">
+    <value>「{0}」のファイルを削除</value>
+  </data>
+  <data name="CopyFileToTemp" xml:space="preserve">
+    <value>「{0}」のファイルを一時ディレクトリ「{1}」にコピーします</value>
+  </data>
+  <data name="CopyFolderToTemp" xml:space="preserve">
+    <value>デコンパイルされた apk フォルダー「{0}」を一時ディレクトリの「{1}」コピーします</value>
+  </data>
+  <data name="DecodeDesDirExists" xml:space="preserve">
+    <value>宛先のディレクトリ「{0}」は既に存在します。 上書きする場合は「宛先のディレクトリを強制的に削除」を有効化してください。</value>
+  </data>
+  <data name="MoveTempApkFileToOutput" xml:space="preserve">
+    <value>一時フォルダー「{0}」を出力先ディレクトリ「{1}」に移動します</value>
+  </data>
+  <data name="MoveTempApkToOutput" xml:space="preserve">
+    <value>一時 APK「{0}」を出力先ディレクトリ「{1}」に移動します</value>
+  </data>
+  <data name="ParsingApkInfo" xml:space="preserve">
+    <value>APK 情報を解析中です...</value>
+  </data>
+  <data name="RestartApplicationPrompt" xml:space="preserve">
+    <value>変更を適用するには再起動が必要です。 アプリを再起動しますか？</value>
+  </data>
+  <data name="DecompilingAllApkFiles" xml:space="preserve">
+    <value>すべての APK ファイルをデコンパイル中</value>
+  </data>
+  <data name="DetectedAsBase" xml:space="preserve">
+    <value>{0} がベースとして検出されました</value>
+  </data>
+  <data name="DetectedAsSplit" xml:space="preserve">
+    <value>{0} が分割として検出されました</value>
+  </data>
+  <data name="ExtractingAllApkFiles" xml:space="preserve">
+    <value>すべての APK ファイルを展開中</value>
+  </data>
+  <data name="MergeFinishedMoveDir" xml:space="preserve">
+    <value>統合が完了しました。 ディレクトリを「{0}」に移動中です</value>
+  </data>
+  <data name="MergingApk" xml:space="preserve">
+    <value>APK を統合中</value>
+  </data>
+  <data name="MovingBasedirectory" xml:space="preserve">
+    <value>ベースディレクトリを「{0}」に移動中です</value>
+  </data>
+  <data name="DirNotExist" xml:space="preserve">
+    <value>ディレクトリ「{0}」は存在しません</value>
+  </data>
+  <data name="TempDirectory" xml:space="preserve">
+    <value>一時ディレクトリ: {0}</value>
+  </data>
+  <data name="ErrorMerging" xml:space="preserve">
+    <value>統合に失敗しました</value>
+  </data>
+  <data name="MergingApkEditor" xml:space="preserve">
+    <value>APKEditor.jar を使用して APK を統合する</value>
+  </data>
+  <data name="Aborted" xml:space="preserve">
+    <value>中断しました</value>
+  </data>
+  <data name="CancelProcess" xml:space="preserve">
+    <value>プロセスをキャンセルしますか？</value>
+  </data>
+  <data name="GettingDevices" xml:space="preserve">
+    <value>デバイスを取得中です...</value>
+  </data>
+  <data name="PleaseWait" xml:space="preserve">
+    <value>お待ちください...</value>
+  </data>
+  <data name="ConfirmKillingAdbServer" xml:space="preserve">
+    <value>ADB サーバーを強制終了しますか？ デバイスを再接続するか、エミュレーターを再起動する必要があるかもしれません</value>
+  </data>
+  <data name="DeviceNotSelected" xml:space="preserve">
+    <value>デバイスが未選択です</value>
+  </data>
+  <data name="DeviceSelected" xml:space="preserve">
+    <value>選択されたデバイス: {0}</value>
+  </data>
+  <data name="DevicesFound" xml:space="preserve">
+    <value>{0} 件のデバイスを検出</value>
+  </data>
+  <data name="InstallApkFailed" xml:space="preserve">
+    <value>APK のインストールに失敗しました</value>
+  </data>
+  <data name="InstallApkSuccessful" xml:space="preserve">
+    <value>APK のインストールに成功しました</value>
+  </data>
+  <data name="InstallingApk" xml:space="preserve">
+    <value>APK をインストール中</value>
+  </data>
+  <data name="InstallingApkPath" xml:space="preserve">
+    <value>APK「{0}」をインストール中です</value>
+  </data>
+  <data name="NoDevicesFound" xml:space="preserve">
+    <value>デバイスはありません。 adb デバイスが ON になっている状態でデバイスがコンピューターに接続されていることを確認してください。 エミュレーターを使用する場合は、再起動して起動まで待機します</value>
+  </data>
+  <data name="TimeEnded" xml:space="preserve">
+    <value>終了時間: {0}</value>
+  </data>
+  <data name="TimeStarted" xml:space="preserve">
+    <value>開始時間: {0}</value>
+  </data>
+  <data name="ClearFrameworkPrompt" xml:space="preserve">
+    <value>予期しないエラーを回避するには、Apktook のバージョンを変更後にフレームワークキャッシュを消去する必要があります。 今すぐに消去しますか？</value>
+  </data>
+  <data name="ClearTempFolder" xml:space="preserve">
+    <value>一時フォルダーを削除中</value>
+  </data>
+  <data name="DeletingFolder" xml:space="preserve">
+    <value>削除するフォルダー: {0}</value>
+  </data>
+  <data name="DirectoryNotExist" xml:space="preserve">
+    <value>ディレクトリ「{0}」は存在しません</value>
+  </data>
+  <data name="OpenComFolder" xml:space="preserve">
+    <value>コンパイル出力先フォルダーを開く</value>
+  </data>
+  <data name="OpenDecFolder" xml:space="preserve">
+    <value>デコンパイル出力先フォルダーを開く</value>
+  </data>
+  <data name="FixApktoolYml" xml:space="preserve">
+    <value>apktool.yml を修正しました</value>
+  </data>
+  <data name="CopyFileTo" xml:space="preserve">
+    <value>「{0}」のファイルを「{1}」にコピー</value>
+  </data>
+  <data name="SplitApkNotFound" xml:space="preserve">
+    <value>分割 APK は未選択です</value>
+  </data>
+  <data name="CantDetectApkeditorVersion" xml:space="preserve">
+    <value> APKEditor バージョンの検出ができません</value>
+  </data>
+  <data name="SetLanguageRestartApplication" xml:space="preserve">
+    <value />
+  </data>
+</root>
@@ -510,6 +510,36 @@
  <data name="ClearFrameworkPrompt" xml:space="preserve">
    <value>После изменения версии Apktool необходимо очистить кеш. Вы хотите очистить его сейчас?</value>
  </data>
+  <data name="RestartApplicationPrompt" xml:space="preserve">
+    <value>Для применения изменений требуется перезапуск. Перезапустить приложение сейчас?</value>
+  </data>
+  <data name="ClearTempFolder" xml:space="preserve">
+    <value>Очистка временной папки</value>
+  </data>
+  <data name="DeletingFolder" xml:space="preserve">
+    <value>Удаление папки: {0}</value>
+  </data>
+  <data name="DirectoryNotExist" xml:space="preserve">
+    <value>Директория "{0}" не существует</value>
+  </data>
+  <data name="OpenComFolder" xml:space="preserve">
+    <value>Открыть папку скомпилированных файлов</value>
+  </data>
+  <data name="OpenDecFolder" xml:space="preserve">
+    <value>Открыть папку декомпилированных файлов</value>
+  </data>
+  <data name="FixApktoolYml" xml:space="preserve">
+    <value>Исправлен apktool.yml</value>
+  </data>
+  <data name="CopyFileTo" xml:space="preserve">
+    <value>Копирование файла "{0}" в "{1}"</value>
+  </data>
+  <data name="SplitApkNotFound" xml:space="preserve">
+    <value>Split APK не выбран</value>
+  </data>
+  <data name="CantDetectApkeditorVersion" xml:space="preserve">
+    <value>Не удалось определить версию APKEditor</value>
+  </data>
  <data name="SetLanguageRestartApplication" xml:space="preserve">
    <value>Язык установлен. Хотите перезапустить программу?</value>
  </data>
@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="About" xml:space="preserve">
+    <value>Hakkında</value>
+  </data>
+  <data name="APKToolVersion" xml:space="preserve">
+    <value>Apktool sürümü</value>
+  </data>
+  <data name="CheckForUpdate" xml:space="preserve">
+    <value>Güncellemeleri kontrol et</value>
+  </data>
+  <data name="DebugMode" xml:space="preserve">
+    <value>Hata ayıklama modu</value>
+  </data>
+  <data name="Exit" xml:space="preserve">
+    <value>Çıkış</value>
+  </data>
+  <data name="File" xml:space="preserve">
+    <value>Dosya</value>
+  </data>
+  <data name="Help" xml:space="preserve">
+    <value>Yardım</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Ayarlar</value>
+  </data>
+  <data name="ErrorJavaDetect" xml:space="preserve">
+    <value>Java yüklü değil veya yanlış yüklenmiş. Lütfen Java’yı yükleyin veya Ayarlar’dan özel konumu ayarlayın</value>
+  </data>
+  <data name="ErrorReadSettings" xml:space="preserve">
+    <value>Ayarlar okunurken hata oluştu!</value>
+  </data>
+  <data name="UpdateNewVersion" xml:space="preserve">
+    <value>Yeni bir sürüm mevcut. Güncellemek ister misiniz?</value>
+  </data>
+  <data name="UpdateNoUpdates" xml:space="preserve">
+    <value>Güncelleme mevcut değil.</value>
+  </data>
+  <data name="WarningDecodingFolderNotSelected" xml:space="preserve">
+    <value>Çözümleme klasörü seçilmedi!</value>
+  </data>
+  <data name="WarningFileForDecodingNotSelected" xml:space="preserve">
+    <value>Çözümleme için dosya seçilmedi!</value>
+  </data>
+  <data name="WarningFileForSigningNotSelected" xml:space="preserve">
+    <value>İmzalama için dosya seçilmedi!</value>
+  </data>
+  <data name="WarningFrameworkNotSelected" xml:space="preserve">
+    <value>Çerçeve seçilmedi!</value>
+  </data>
+  <data name="ErrorSaveSettings" xml:space="preserve">
+    <value>Ayarlar kaydedilirken hata oluştu!</value>
+  </data>
+  <data name="NeedRestart" xml:space="preserve">
+    <value>Değişikliklerin etkili olması için programı yeniden başlatmanız gerekiyor. Şimdi yapmak ister misiniz?</value>
+  </data>
+  <data name="FileNotFound" xml:space="preserve">
+    <value>Dosya bulunamadı</value>
+  </data>
+  <data name="FolderNotExist" xml:space="preserve">
+    <value>Klasör mevcut değil</value>
+  </data>
+  <data name="Error" xml:space="preserve">
+    <value>Hata</value>
+  </data>
+  <data name="Build" xml:space="preserve">
+    <value>Derle</value>
+  </data>
+  <data name="Decode" xml:space="preserve">
+    <value>Çözümle</value>
+  </data>
+  <data name="InstallFramework" xml:space="preserve">
+    <value>Çerçeveyi yükle</value>
+  </data>
+  <data name="Sign" xml:space="preserve">
+    <value>İmzala</value>
+  </data>
+  <data name="SystemLanguage" xml:space="preserve">
+    <value>Sistem dili</value>
+  </data>
+  <data name="DoYouRealyWantToInstallCM" xml:space="preserve">
+    <value>Bağlam menüsünü gerçekten yüklemek istiyor musunuz?</value>
+  </data>
+  <data name="DoYouRealyWantToRemoveCM" xml:space="preserve">
+    <value>Bağlam menüsünü gerçekten kaldırmak istiyor musunuz?</value>
+  </data>
+  <data name="Done" xml:space="preserve">
+    <value>Tamamlandı</value>
+  </data>
+  <data name="CantDetectApktoolVersion" xml:space="preserve">
+    <value>Apktool sürümü tespit edilemedi.</value>
+  </data>
+  <data name="DecompilingSuccessfullyCompleted" xml:space="preserve">
+    <value>Çözümleme başarıyla tamamlandı. Çıkış dizini "{0}".</value>
+  </data>
+  <data name="ErrorUpdateChecking" xml:space="preserve">
+    <value>Güncelleme kontrolü hatası:</value>
+  </data>
+  <data name="SignSuccessfullyCompleted" xml:space="preserve">
+    <value>İmzalama başarıyla tamamlandı. Dosya "{0}" konumuna kaydedildi.</value>
+  </data>
+  <data name="Aligning" xml:space="preserve">
+    <value>Hizalama</value>
+  </data>
+  <data name="ErrorCompiling" xml:space="preserve">
+    <value>Derleme başarısız</value>
+  </data>
+  <data name="ErrorEnteringFrameworkTag" xml:space="preserve">
+    <value>Çerçeve etiketi girilirken hata oluştu.</value>
+  </data>
+  <data name="ErrorSelectedFileNotExist" xml:space="preserve">
+    <value>Seçilen dosya mevcut değil.</value>
+  </data>
+  <data name="ErrorSelectingFrameworkDirectory" xml:space="preserve">
+    <value>Çerçeve dizini seçilirken hata oluştu.</value>
+  </data>
+  <data name="ErrorSelectingFrameworkFile" xml:space="preserve">
+    <value>Çerçeve dosyası seçilirken hata oluştu. Dosya mevcut değil.</value>
+  </data>
+  <data name="ErrorSigning" xml:space="preserve">
+    <value>İmzalama başarısız.</value>
+  </data>
+  <data name="FrameworkInstallationNotStarted" xml:space="preserve">
+    <value>Hata. Çerçeve kurulumu başlatılmadı.</value>
+  </data>
+  <data name="InstallingFramework" xml:space="preserve">
+    <value>Çerçeve yükleniyor</value>
+  </data>
+  <data name="Signing" xml:space="preserve">
+    <value>İmzalanıyor</value>
+  </data>
+  <data name="SignInputFileNotFound" xml:space="preserve">
+    <value>Giriş dosyası bulunamadı.</value>
+  </data>
+  <data name="SignPrivateKeyNotFound" xml:space="preserve">
+    <value>Özel anahtar bulunamadı.</value>
+  </data>
+  <data name="SignPublicKeyNotFound" xml:space="preserve">
+    <value>Genel anahtar bulunamadı.</value>
+  </data>
+  <data name="ZIPArchives" xml:space="preserve">
+    <value>ZIP arşivleri</value>
+  </data>
+  <data name="DecodeCouldNotCreate" xml:space="preserve">
+    <value>Seçilen çözümleme dizini, geçersiz karakterler içerdiği için oluşturulamadı.</value>
+  </data>
+  <data name="DecodeDirNotSelected" xml:space="preserve">
+    <value>Çözümleme dizini seçilmedi.</value>
+  </data>
+  <data name="DecodeSelectedFrameworkNotExist" xml:space="preserve">
+    <value>Seçilen çerçeve dizini mevcut değil.</value>
+  </data>
+  <data name="Decoding" xml:space="preserve">
+    <value>Çözümleniyor</value>
+  </data>
+  <data name="ErrorDecompiling" xml:space="preserve">
+    <value>Çözümleme başarısız</value>
+  </data>
+  <data name="ExecutableFile" xml:space="preserve">
+    <value>Çalıştırılabilir dosya</value>
+  </data>
+  <data name="ChangedTargetSdkTo29" xml:space="preserve">
+    <value>Hedef SDK 29’a değiştirildi</value>
+  </data>
+  <data name="ErrorVersionParsing" xml:space="preserve">
+    <value>Sürüm ayrıştırılamadı</value>
+  </data>
+  <data name="FixAndroidManifest" xml:space="preserve">
+    <value>AndroidManifest.xml düzeltildi</value>
+  </data>
+  <data name="RemoveApkToolDummies" xml:space="preserve">
+    <value>Tüm ApkTool kuklaları kaldırıldı</value>
+  </data>
+  <data name="APKSelected" xml:space="preserve">
+    <value>APK Seçildi:</value>
+  </data>
+  <data name="ErrorSelectedFolderNotExist" xml:space="preserve">
+    <value>Seçilen klasör mevcut değil.</value>
+  </data>
+  <data name="AndroidManifestNotExist" xml:space="preserve">
+    <value>AndroidManifest.xml mevcut değil</value>
+  </data>
+  <data name="DecompiledAPKNotExist" xml:space="preserve">
+    <value>Çözümlenmiş APK dizini mevcut değil</value>
+  </data>
+  <data name="MainActivityFound" xml:space="preserve">
+    <value>Ana aktivite "{0}" içinde bulundu</value>
+  </data>
+  <data name="MainActivityNotFoundPleaseFindManually" xml:space="preserve">
+    <value>MainActivity bulunamadı. Lütfen manuel olarak bulun</value>
+  </data>
+  <data name="ClearingFramework" xml:space="preserve">
+    <value>Çerçeve temizleniyor</value>
+  </data>
+  <data name="CompilingSuccessfullyCompleted" xml:space="preserve">
+    <value>Derleme başarıyla tamamlandı. Çıkış dizini "{0}"</value>
+  </data>
+  <data name="ErrorZipalign" xml:space="preserve">
+    <value>Zipalign başarısız</value>
+  </data>
+  <data name="ZipalignFileSavedTo" xml:space="preserve">
+    <value>Zipalign başarıyla tamamlandı. Dosya "{0}" konumuna kaydedildi</value>
+  </data>
+  <data name="ErrorClearingFw" xml:space="preserve">
+    <value>Çerçeve temizlenirken hata oluştu</value>
+  </data>
+  <data name="FrameworkCacheCleared" xml:space="preserve">
+    <value>Çerçeve önbelleği temizlendi</value>
+  </data>
+  <data name="AllDone" xml:space="preserve">
+    <value>Hepsi tamamlandı!</value>
+  </data>
+  <data name="FrameworkInstalled" xml:space="preserve">
+    <value>Çerçeve başarıyla yüklendi</value>
+  </data>
+  <data name="FrameworkDirNotExist" xml:space="preserve">
+    <value>Çerçeve dizini mevcut değil</value>
+  </data>
+  <data name="DecompilingDex" xml:space="preserve">
+    <value>Dex çözümlemesi yapılıyor</value>
+  </data>
+  <data name="ErrorSelectedOutputFolderNotExist" xml:space="preserve">
+    <value>Seçilen çıkış klasörü mevcut değil.</value>
+  </data>
+  <data name="CompilingDex" xml:space="preserve">
+    <value>Dex derleniyor</value>
+  </data>
+  <data name="DragDropNotSupported" xml:space="preserve">
+    <value>Yönetici olarak çalışıyorsunuz. Sürükle ve bırak desteklenmeyebilir</value>
+  </data>
+  <data name="DragDropSupported" xml:space="preserve">
+    <value>Sürükle ve bırak destekleniyor</value>
+  </data>
+  <data name="ErrorNotAnApk" xml:space="preserve">
+    <value>Bu dizin bir Android paketi değil</value>
+  </data>
+  <data name="Baksmali" xml:space="preserve">
+    <value>Baksmali</value>
+  </data>
+  <data name="Smali" xml:space="preserve">
+    <value>Smali</value>
+  </data>
+  <data name="Zipalign" xml:space="preserve">
+    <value>Zipalign</value>
+  </data>
+  <data name="CompileApk" xml:space="preserve">
+    <value>APK’yı derle</value>
+  </data>
+  <data name="CompileDex" xml:space="preserve">
+    <value>DEX’i birleştir</value>
+  </data>
+  <data name="DecompileApk" xml:space="preserve">
+    <value>APK’yı çözümle</value>
+  </data>
+  <data name="DecompileDex" xml:space="preserve">
+    <value>DEX’i parçala</value>
+  </data>
+  <data name="GetApkInfo" xml:space="preserve">
+    <value>APK Bilgilerini Görüntüle</value>
+  </data>
+  <data name="NotDecompiledApk" xml:space="preserve">
+    <value>Bu klasör çözümlenmiş bir APK değil</value>
+  </data>
+  <data name="NotDecompiledDex" xml:space="preserve">
+    <value>Bu klasör çözümlenmiş bir DEX değil</value>
+  </data>
+  <data name="RequiredFilesMissing" xml:space="preserve">
+    <value>Gerekli dosyalar eksik</value>
+  </data>
+  <data name="SignApk" xml:space="preserve">
+    <value>APK’yı imzala</value>
+  </data>
+  <data name="TextFile" xml:space="preserve">
+    <value>Metin dosyası</value>
+  </data>
+  <data name="ZipalignApk" xml:space="preserve">
+    <value>APK’yı zipalign yap</value>
+  </data>
+  <data name="CreateUnsignedApk" xml:space="preserve">
+    <value>İmzasız APK oluşturuluyor</value>
+  </data>
+  <data name="MetainfNotExist" xml:space="preserve">
+    <value>META-INF klasörü mevcut değil. Atlandı</value>
+  </data>
+  <data name="ErrorGettingApkInfo" xml:space="preserve">
+    <value>APK bilgileri alınırken hata oluştu</value>
+  </data>
+  <data name="InputDirectory" xml:space="preserve">
+    <value>Giriş dizini: {0}</value>
+  </data>
+  <data name="InputFile" xml:space="preserve">
+    <value>Giriş dosyası: {0}</value>
+  </data>
+  <data name="DeleteFile" xml:space="preserve">
+    <value>"{0}" dosyasını sil</value>
+  </data>
+  <data name="CopyFileToTemp" xml:space="preserve">
+    <value>"{0}" dosyasını "{1}" geçici dizinine kopyala</value>
+  </data>
+  <data name="CopyFolderToTemp" xml:space="preserve">
+    <value>Çözümlenmiş apk klasörünü "{0}" "{1}" geçici dizinine kopyala</value>
+  </data>
+  <data name="DecodeDesDirExists" xml:space="preserve">
+    <value>Hedef dizin "{0}" zaten mevcut. Üzerine yazmak istiyorsanız "Hedef dizini zorla sil" seçeneğini etkinleştirin.</value>
+  </data>
+  <data name="MoveTempApkFileToOutput" xml:space="preserve">
+    <value>Geçici klasörü "{0}" çıkış dizinine "{1}" taşı</value>
+  </data>
+  <data name="MoveTempApkToOutput" xml:space="preserve">
+    <value>Geçici apk’yı "{0}" çıkış dizinine "{1}" taşı</value>
+  </data>
+  <data name="ParsingApkInfo" xml:space="preserve">
+    <value>APK Bilgileri Ayrıştırılıyor...</value>
+  </data>
+  <data name="RestartApplicationPrompt" xml:space="preserve">
+    <value>Değişiklikleri uygulamak için yeniden başlatma gerekiyor. Uygulamayı şimdi yeniden başlatmak ister misiniz?</value>
+  </data>
+  <data name="DecompilingAllApkFiles" xml:space="preserve">
+    <value>Tüm APK dosyaları çözümleniyor</value>
+  </data>
+  <data name="DetectedAsBase" xml:space="preserve">
+    <value>{0} temel olarak algılandı</value>
+  </data>
+  <data name="DetectedAsSplit" xml:space="preserve">
+    <value>{0} bölünmüş olarak algılandı</value>
+  </data>
+  <data name="ExtractingAllApkFiles" xml:space="preserve">
+    <value>Tüm APK dosyaları çıkarılıyor</value>
+  </data>
+  <data name="MergeFinishedMoveDir" xml:space="preserve">
+    <value>Birleştirme tamamlandı. Dizin "{0}" konumuna taşınıyor</value>
+  </data>
+  <data name="MergingApk" xml:space="preserve">
+    <value>APK birleştiriliyor</value>
+  </data>
+  <data name="MovingBasedirectory" xml:space="preserve">
+    <value>Temel dizin "{0}" konumuna taşınıyor</value>
+  </data>
+  <data name="DirNotExist" xml:space="preserve">
+    <value>"{0}" dizini mevcut değil</value>
+  </data>
+  <data name="TempDirectory" xml:space="preserve">
+    <value>Geçici dizin: "{0}"</value>
+  </data>
+  <data name="ErrorMerging" xml:space="preserve">
+    <value>Birleştirme başarısız</value>
+  </data>
+  <data name="MergingApkEditor" xml:space="preserve">
+    <value>APK, APKEditor.jar kullanılarak birleştiriliyor</value>
+  </data>
+  <data name="Aborted" xml:space="preserve">
+    <value>İptal edildi</value>
+  </data>
+  <data name="CancelProcess" xml:space="preserve">
+    <value>İşlemi iptal etmek istediğinizden emin misiniz?</value>
+  </data>
+  <data name="GettingDevices" xml:space="preserve">
+    <value>Cihazlar alınıyor...</value>
+  </data>
+  <data name="PleaseWait" xml:space="preserve">
+    <value>Lütfen bekleyin...</value>
+  </data>
+  <data name="ConfirmKillingAdbServer" xml:space="preserve">
+    <value>ADB sunucusunu sonlandırmak istediğinizden emin misiniz? Cihazınızı yeniden bağlamanız veya emülatörü yeniden başlatmanız gerekebilir</value>
+  </data>
+  <data name="DeviceNotSelected" xml:space="preserve">
+    <value>Cihaz seçilmedi</value>
+  </data>
+  <data name="DeviceSelected" xml:space="preserve">
+    <value>Cihaz seçildi "{0}"</value>
+  </data>
+  <data name="DevicesFound" xml:space="preserve">
+    <value>{0} cihaz bulundu</value>
+  </data>
+  <data name="InstallApkFailed" xml:space="preserve">
+    <value>APK Kurulumu başarısız</value>
+  </data>
+  <data name="InstallApkSuccessful" xml:space="preserve">
+    <value>APK Kurulumu başarılı</value>
+  </data>
+  <data name="InstallingApk" xml:space="preserve">
+    <value>APK yükleniyor</value>
+  </data>
+  <data name="InstallingApkPath" xml:space="preserve">
+    <value>"{0}" APK’sı yükleniyor</value>
+  </data>
+  <data name="NoDevicesFound" xml:space="preserve">
+    <value>Cihaz bulunamadı. Cihazınızın bilgisayara bağlı olduğundan ve adb hata ayıklamasının açık olduğundan emin olun. Emülatör kullanıyorsanız, yeniden başlatın ve açılmasını bekleyin</value>
+  </data>
+  <data name="TimeEnded" xml:space="preserve">
+    <value>Bitiş zamanı: {0}</value>
+  </data>
+  <data name="TimeStarted" xml:space="preserve">
+    <value>Başlangıç zamanı: {0}</value>
+  </data>
+  <data name="ClearFrameworkPrompt" xml:space="preserve">
+    <value>Apktool sürümü değiştirildikten sonra beklenmedik hataları önlemek için çerçeve önbelleğini temizlemek gerekiyor. Şimdi temizlemek ister misiniz?</value>
+  </data>
+  <data name="ClearTempFolder" xml:space="preserve">
+    <value>Geçici klasör temizleniyor</value>
+  </data>
+  <data name="DeletingFolder" xml:space="preserve">
+    <value>Klasör siliniyor: {0}</value>
+  </data>
+  <data name="DirectoryNotExist" xml:space="preserve">
+    <value>"{0}" dizini mevcut değil</value>
+  </data>
+  <data name="OpenComFolder" xml:space="preserve">
+    <value>Derleme çıkış klasörünü aç</value>
+  </data>
+  <data name="OpenDecFolder" xml:space="preserve">
+    <value>Çözümleme çıkış klasörünü aç</value>
+  </data>
+  <data name="FixApktoolYml" xml:space="preserve">
+    <value>apktool.yml düzeltildi</value>
+  </data>
+  <data name="CopyFileTo" xml:space="preserve">
+    <value>"{0}" dosyasını "{1}" konumuna kopyala</value>
+  </data>
+  <data name="SplitApkNotFound" xml:space="preserve">
+    <value>Bölünmüş APK seçilmedi</value>
+  </data>
+  <data name="CantDetectApkeditorVersion" xml:space="preserve">
+    <value>APKEditor sürümü tespit edilemedi</value>
+  </data>
+  <data name="SetLanguageRestartApplication" xml:space="preserve">
+    <value />
+  </data>
+</root>
@@ -142,37 +142,37 @@
    <value>Cài đặt</value>
  </data>
  <data name="ErrorJavaDetect" xml:space="preserve">
-    <value>Java chưa được cài đặt hoặc cài đặt không chính xác. Chương trình sẽ bị đóng.</value>
+    <value>Java chưa được cài đặt hoặc đã cài đặt không đúng. Vui lòng cài đặt Java hoặc đặt vị trí tùy chỉnh trong Cài đặt</value>
  </data>
  <data name="ErrorReadSettings" xml:space="preserve">
-    <value>Lỗi khi đọc cài đặt!</value>
+    <value>Lỗi đọc cài đặt!</value>
  </data>
  <data name="UpdateNewVersion" xml:space="preserve">
-    <value>Phiên bản mới đã được phát hành. Bạn có muốn cập nhật không?</value>
+    <value>Có phiên bản mới. Bạn có muốn cập nhật không?</value>
  </data>
  <data name="UpdateNoUpdates" xml:space="preserve">
-    <value>Không có bản cập nhật nào khả dụng.</value>
+    <value>Không có bản cập nhật nào.</value>
  </data>
  <data name="WarningDecodingFolderNotSelected" xml:space="preserve">
-    <value>Chưa chọn thư mục giải mã!</value>
+    <value>Thư mục dịch ngược chưa được chọn!</value>
  </data>
  <data name="WarningFileForDecodingNotSelected" xml:space="preserve">
-    <value>Chưa chọn tệp để giải mã!</value>
+    <value>Tệp để dịch ngược chưa được chọn!</value>
  </data>
  <data name="WarningFileForSigningNotSelected" xml:space="preserve">
-    <value>Chưa chọn tệp để ký!</value>
+    <value>Tệp để ký chưa được chọn!</value>
  </data>
  <data name="WarningFrameworkNotSelected" xml:space="preserve">
-    <value>Chưa chọn Framework!</value>
+    <value>Framework chưa được chọn!</value>
  </data>
  <data name="ErrorSaveSettings" xml:space="preserve">
-    <value>Lỗi khi lưu cài đặt!</value>
+    <value>Lỗi lưu cài đặt!</value>
  </data>
  <data name="NeedRestart" xml:space="preserve">
-    <value>Để những thay đổi này có hiệu lực, bạn phải khởi động lại chương trình. Bạn có muốn khởi động lại ngay bây giờ không?</value>
+    <value>Để các thay đổi có hiệu lực, bạn phải khởi động lại chương trình. Bạn có muốn thực hiện ngay bây giờ không?</value>
  </data>
  <data name="FileNotFound" xml:space="preserve">
-    <value>Tệp không tìm thấy</value>
+    <value>Không tìm thấy tệp</value>
  </data>
  <data name="FolderNotExist" xml:space="preserve">
    <value>Thư mục không tồn tại</value>
@@ -181,13 +181,13 @@
    <value>Lỗi</value>
  </data>
  <data name="Build" xml:space="preserve">
-    <value>Xây dựng</value>
+    <value>Biên dịch</value>
  </data>
  <data name="Decode" xml:space="preserve">
-    <value>Giải mã</value>
+    <value>Dịch ngược</value>
  </data>
  <data name="InstallFramework" xml:space="preserve">
-    <value>Cài đặt Framework</value>
+    <value>Cài đặt framework</value>
  </data>
  <data name="Sign" xml:space="preserve">
    <value>Ký</value>
@@ -196,10 +196,10 @@
    <value>Ngôn ngữ hệ thống</value>
  </data>
  <data name="DoYouRealyWantToInstallCM" xml:space="preserve">
-    <value>Bạn thực sự muốn cài đặt menu ngữ cảnh không?</value>
+    <value>Bạn có thực sự muốn cài đặt menu ngữ cảnh không?</value>
  </data>
  <data name="DoYouRealyWantToRemoveCM" xml:space="preserve">
-    <value>Bạn thực sự muốn xóa menu ngữ cảnh không?</value>
+    <value>Bạn có thực sự muốn xóa menu ngữ cảnh không?</value>
  </data>
  <data name="Done" xml:space="preserve">
    <value>Hoàn tất</value>
@@ -208,40 +208,40 @@
    <value>Không thể phát hiện phiên bản apktool.</value>
  </data>
  <data name="DecompilingSuccessfullyCompleted" xml:space="preserve">
-    <value>Giải mã hoàn tất thành công. Thư mục đầu ra "{0}"</value>
+    <value>Dịch ngược thành công. Thư mục đầu ra "{0}".</value>
  </data>
  <data name="ErrorUpdateChecking" xml:space="preserve">
    <value>Lỗi kiểm tra cập nhật:</value>
  </data>
  <data name="SignSuccessfullyCompleted" xml:space="preserve">
-    <value>Ký hoàn tất thành công. Tệp được lưu vào "{0}"</value>
+    <value>Ký thành công. Tệp đã được lưu vào "{0}".</value>
  </data>
  <data name="Aligning" xml:space="preserve">
    <value>Đang căn chỉnh</value>
  </data>
  <data name="ErrorCompiling" xml:space="preserve">
-    <value>Lỗi biên dịch</value>
+    <value>Biên dịch thất bại</value>
  </data>
  <data name="ErrorEnteringFrameworkTag" xml:space="preserve">
-    <value>Lỗi nhập thẻ Framework.</value>
+    <value>Lỗi nhập thẻ framework.</value>
  </data>
  <data name="ErrorSelectedFileNotExist" xml:space="preserve">
    <value>Tệp đã chọn không tồn tại.</value>
  </data>
  <data name="ErrorSelectingFrameworkDirectory" xml:space="preserve">
-    <value>Lỗi chọn thư mục Framework.</value>
+    <value>Lỗi chọn thư mục framework.</value>
  </data>
  <data name="ErrorSelectingFrameworkFile" xml:space="preserve">
-    <value>Lỗi khi chọn tệp Framework. Tệp này không tồn tại.</value>
+    <value>Lỗi chọn tệp framework. Tệp không tồn tại.</value>
  </data>
  <data name="ErrorSigning" xml:space="preserve">
-    <value>Lỗi ký.</value>
+    <value>Ký thất bại.</value>
  </data>
  <data name="FrameworkInstallationNotStarted" xml:space="preserve">
-    <value>Lỗi. Việc cài đặt Framework chưa bắt đầu.</value>
+    <value>Lỗi. Việc cài đặt framework chưa được bắt đầu.</value>
  </data>
  <data name="InstallingFramework" xml:space="preserve">
-    <value>Đang cài đặt Framework</value>
+    <value>Đang cài đặt framework</value>
  </data>
  <data name="Signing" xml:space="preserve">
    <value>Đang ký</value>
@@ -256,37 +256,37 @@
    <value>Không tìm thấy khóa công khai.</value>
  </data>
  <data name="ZIPArchives" xml:space="preserve">
-    <value>Lưu trữ ZIP</value>
+    <value>Tệp nén ZIP</value>
  </data>
  <data name="DecodeCouldNotCreate" xml:space="preserve">
-    <value>Không thể tạo thư mục giải mã đã chọn vì chứa ký tự không hợp lệ.</value>
+    <value>Thư mục dịch ngược đã chọn không thể được tạo vì chứa các ký tự không hợp lệ.</value>
  </data>
  <data name="DecodeDirNotSelected" xml:space="preserve">
-    <value>Chưa chọn thư mục giải mã.</value>
+    <value>Thư mục dịch ngược chưa được chọn.</value>
  </data>
  <data name="DecodeSelectedFrameworkNotExist" xml:space="preserve">
-    <value>Thư mục Framework đã chọn không tồn tại.</value>
+    <value>Thư mục framework đã chọn không tồn tại.</value>
  </data>
  <data name="Decoding" xml:space="preserve">
-    <value>Đang giải mã</value>
+    <value>Đang dịch ngược</value>
  </data>
  <data name="ErrorDecompiling" xml:space="preserve">
-    <value>Lỗi giải mã</value>
+    <value>Dịch ngược thất bại</value>
  </data>
  <data name="ExecutableFile" xml:space="preserve">
    <value>Tệp thực thi</value>
  </data>
  <data name="ChangedTargetSdkTo29" xml:space="preserve">
-    <value>Đã thay đổi Target SDK thành 29</value>
+    <value>Đã thay đổi target SDK thành 29</value>
  </data>
  <data name="ErrorVersionParsing" xml:space="preserve">
-    <value>Lỗi phân tích phiên bản</value>
+    <value>Phân tích phiên bản thất bại</value>
  </data>
  <data name="FixAndroidManifest" xml:space="preserve">
-    <value>Sửa AndroidManifest.xml</value>
+    <value>Đã sửa tệp AndroidManifest.xml</value>
  </data>
  <data name="RemoveApkToolDummies" xml:space="preserve">
-    <value>Xóa tất cả các đối tượng giả ApkTool</value>
+    <value>Đã xóa tất cả các tệp giả của ApkTool</value>
  </data>
  <data name="APKSelected" xml:space="preserve">
    <value>APK đã chọn:</value>
@@ -295,13 +295,13 @@
    <value>Thư mục đã chọn không tồn tại.</value>
  </data>
  <data name="AndroidManifestNotExist" xml:space="preserve">
-    <value>AndroidManifest.xml không tồn tại</value>
+    <value>Tệp AndroidManifest.xml không tồn tại</value>
  </data>
  <data name="DecompiledAPKNotExist" xml:space="preserve">
-    <value>Thư mục APK đã giải mã không tồn tại</value>
+    <value>Thư mục APK đã dịch ngược không tồn tại</value>
  </data>
  <data name="MainActivityFound" xml:space="preserve">
-    <value>Đã tìm thấy Activity chính trong "{0}"</value>
+    <value>Đã tìm thấy activity chính trong "{0}"</value>
  </data>
  <data name="MainActivityNotFoundPleaseFindManually" xml:space="preserve">
    <value>Không thể tìm thấy MainActivity. Vui lòng tìm thủ công</value>
@@ -310,22 +310,22 @@
    <value>Đang xóa Framework</value>
  </data>
  <data name="CompilingSuccessfullyCompleted" xml:space="preserve">
-    <value>Biên dịch hoàn tất thành công. Thư mục đầu ra "{0}"</value>
+    <value>Biên dịch thành công. Thư mục đầu ra "{0}"</value>
  </data>
  <data name="ErrorZipalign" xml:space="preserve">
-    <value>Lỗi Zip căn chỉnh</value>
+    <value>Zipalign thất bại</value>
  </data>
  <data name="ZipalignFileSavedTo" xml:space="preserve">
-    <value>Zip căn chỉnh hoàn tất thành công. Tệp được lưu vào "{0}"</value>
+    <value>Zipalign thành công. Tệp đã được lưu vào "{0}"</value>
  </data>
  <data name="ErrorClearingFw" xml:space="preserve">
-    <value>Lỗi xóa Framework</value>
+    <value>Lỗi xóa framework</value>
  </data>
  <data name="FrameworkCacheCleared" xml:space="preserve">
-    <value>Bộ nhớ đệm Framework đã được xóa</value>
+    <value>Đã xóa bộ nhớ đệm của Framework</value>
  </data>
  <data name="AllDone" xml:space="preserve">
-    <value>Đã hoàn tất!</value>
+    <value>Đã xong tất cả!</value>
  </data>
  <data name="FrameworkInstalled" xml:space="preserve">
    <value>Framework đã được cài đặt thành công</value>
@@ -334,7 +334,7 @@
    <value>Thư mục Framework không tồn tại</value>
  </data>
  <data name="DecompilingDex" xml:space="preserve">
-    <value>Đang giải mã dex</value>
+    <value>Đang dịch ngược dex</value>
  </data>
  <data name="ErrorSelectedOutputFolderNotExist" xml:space="preserve">
    <value>Thư mục đầu ra đã chọn không tồn tại.</value>
@@ -343,13 +343,13 @@
    <value>Đang biên dịch dex</value>
  </data>
  <data name="DragDropNotSupported" xml:space="preserve">
-    <value>Bạn đang chạy với tư cách quản trị viên. Kéo và thả không được hỗ trợ.</value>
+    <value>Bạn đang chạy với quyền quản trị viên. Kéo và thả có thể không được hỗ trợ</value>
  </data>
  <data name="DragDropSupported" xml:space="preserve">
-    <value>Hỗ trợ kéo và thả</value>
+    <value>Kéo và thả được hỗ trợ</value>
  </data>
  <data name="ErrorNotAnApk" xml:space="preserve">
-    <value>Thư mục này không phải là gói Android</value>
+    <value>Thư mục này không phải là một gói Android</value>
  </data>
  <data name="Baksmali" xml:space="preserve">
    <value>Baksmali</value>
@@ -358,7 +358,7 @@
    <value>Smali</value>
  </data>
  <data name="Zipalign" xml:space="preserve">
-    <value>Zip căn chỉnh</value>
+    <value>Zipalign</value>
  </data>
  <data name="CompileApk" xml:space="preserve">
    <value>Biên dịch APK</value>
@@ -367,22 +367,22 @@
    <value>Biên dịch DEX</value>
  </data>
  <data name="DecompileApk" xml:space="preserve">
-    <value>Giải mã APK</value>
+    <value>Dịch ngược APK</value>
  </data>
  <data name="DecompileDex" xml:space="preserve">
-    <value>Giải mã DEX</value>
+    <value>Dịch ngược DEX</value>
  </data>
  <data name="GetApkInfo" xml:space="preserve">
-    <value>Lấy thông tin APK</value>
+    <value>Xem thông tin APK</value>
  </data>
  <data name="NotDecompiledApk" xml:space="preserve">
-    <value>Thư mục này không phải là APK đã giải mã</value>
+    <value>Thư mục này không phải là một APK đã được dịch ngược</value>
  </data>
  <data name="NotDecompiledDex" xml:space="preserve">
-    <value>Thư mục này không phải là DEX đã giải mã</value>
+    <value>Thư mục này không phải là một DEX đã được dịch ngược</value>
  </data>
  <data name="RequiredFilesMissing" xml:space="preserve">
-    <value>Thiếu tệp cần thiết</value>
+    <value>Các tệp cần thiết bị thiếu</value>
  </data>
  <data name="SignApk" xml:space="preserve">
    <value>Ký APK</value>
@@ -391,16 +391,16 @@
    <value>Tệp văn bản</value>
  </data>
  <data name="ZipalignApk" xml:space="preserve">
-    <value>Zip căn chỉnh APK</value>
+    <value>Zipalign APK</value>
  </data>
  <data name="CreateUnsignedApk" xml:space="preserve">
-    <value>Tạo APK chưa ký</value>
+    <value>Đang tạo APK chưa ký</value>
  </data>
  <data name="MetainfNotExist" xml:space="preserve">
    <value>Thư mục META-INF không tồn tại. Đã bỏ qua</value>
  </data>
  <data name="ErrorGettingApkInfo" xml:space="preserve">
-    <value>Lỗi khi lấy thông tin APK</value>
+    <value>Đã xảy ra lỗi khi lấy thông tin APK</value>
  </data>
  <data name="InputDirectory" xml:space="preserve">
    <value>Thư mục đầu vào: {0}</value>
@@ -415,43 +415,43 @@
    <value>Sao chép tệp "{0}" vào thư mục tạm "{1}"</value>
  </data>
  <data name="CopyFolderToTemp" xml:space="preserve">
-    <value>Sao chép thư mục apk đã giải mã "{0}" vào thư mục tạm "{1}"</value>
+    <value>Sao chép thư mục apk đã dịch ngược "{0}" vào thư mục tạm "{1}"</value>
  </data>
  <data name="DecodeDesDirExists" xml:space="preserve">
-    <value>Thư mục đích "{0}" đã tồn tại. Nếu bạn muốn ghi đè lên nó, hãy bật "Buộc xóa thư mục đích".</value>
+    <value>Thư mục đích "{0}" đã tồn tại. Bật "Buộc xóa thư mục đích" nếu bạn muốn ghi đè lên nó.</value>
  </data>
  <data name="MoveTempApkFileToOutput" xml:space="preserve">
-    <value>Di chuyển thư mục tạm "{0}" vào thư mục đầu ra "{1}"</value>
+    <value>Di chuyển thư mục tạm "{0}" đến thư mục đầu ra "{1}"</value>
  </data>
  <data name="MoveTempApkToOutput" xml:space="preserve">
-    <value>Di chuyển apk tạm "{0}" vào thư mục đầu ra "{1}"</value>
+    <value>Di chuyển apk tạm "{0}" đến thư mục đầu ra "{1}"</value>
  </data>
  <data name="ParsingApkInfo" xml:space="preserve">
    <value>Đang phân tích thông tin APK...</value>
  </data>
  <data name="RestartApplicationPrompt" xml:space="preserve">
-    <value>Cần khởi động lại để áp dụng thay đổi. Bạn có muốn khởi động lại ứng dụng không?</value>
+    <value>Cần khởi động lại để áp dụng các thay đổi. Bạn có muốn khởi động lại ứng dụng không?</value>
  </data>
  <data name="DecompilingAllApkFiles" xml:space="preserve">
-    <value>Đang giải mã tất cả các tệp APK</value>
+    <value>Đang dịch ngược tất cả các tệp APK</value>
  </data>
  <data name="DetectedAsBase" xml:space="preserve">
-    <value>{0} được phát hiện là mô-đun cơ sở</value>
+    <value>{0} được phát hiện là base</value>
  </data>
  <data name="DetectedAsSplit" xml:space="preserve">
-    <value>{0} được phát hiện là tệp chia nhỏ</value>
+    <value>{0} được phát hiện là split</value>
  </data>
  <data name="ExtractingAllApkFiles" xml:space="preserve">
-    <value>Đang trích xuất tất cả các tệp APK</value>
+    <value>Đang giải nén tất cả các tệp APK</value>
  </data>
  <data name="MergeFinishedMoveDir" xml:space="preserve">
-    <value>Hoàn tất hợp nhất. Di chuyển thư mục đến "{0}"</value>
+    <value>Hợp nhất hoàn tất. Đang di chuyển thư mục đến "{0}"</value>
  </data>
  <data name="MergingApk" xml:space="preserve">
    <value>Đang hợp nhất APK</value>
  </data>
  <data name="MovingBasedirectory" xml:space="preserve">
-    <value>Đang di chuyển thư mục mô-đun cơ sở đến "{0}"</value>
+    <value>Đang di chuyển thư mục base đến "{0}"</value>
  </data>
  <data name="DirNotExist" xml:space="preserve">
    <value>Thư mục "{0}" không tồn tại</value>
@@ -460,28 +460,28 @@
    <value>Thư mục tạm: "{0}"</value>
  </data>
  <data name="ErrorMerging" xml:space="preserve">
-    <value>Lỗi hợp nhất</value>
+    <value>Hợp nhất thất bại</value>
  </data>
  <data name="MergingApkEditor" xml:space="preserve">
    <value>Đang hợp nhất APK bằng APKEditor.jar</value>
  </data>
  <data name="Aborted" xml:space="preserve">
-    <value>Đã bị hủy bỏ</value>
+    <value>Đã hủy</value>
  </data>
  <data name="CancelProcess" xml:space="preserve">
-    <value>Bạn có chắc chắn muốn hủy bỏ quy trình này không?</value>
+    <value>Bạn có chắc muốn hủy tiến trình không?</value>
  </data>
  <data name="GettingDevices" xml:space="preserve">
-    <value>Đang lấy thiết bị...</value>
+    <value>Đang lấy danh sách thiết bị...</value>
  </data>
  <data name="PleaseWait" xml:space="preserve">
-    <value>Vui lòng chờ...</value>
+    <value>Vui lòng đợi...</value>
  </data>
  <data name="ConfirmKillingAdbServer" xml:space="preserve">
-    <value>Bạn có chắc chắn muốn chấm dứt máy chủ ADB không? Bạn có thể cần phải kết nối lại thiết bị của mình hoặc khởi động lại trình giả lập</value>
+    <value>Bạn có chắc muốn tắt máy chủ ADB không? Bạn có thể cần kết nối lại thiết bị hoặc khởi động lại trình giả lập</value>
  </data>
  <data name="DeviceNotSelected" xml:space="preserve">
-    <value>Chưa chọn thiết bị</value>
+    <value>Thiết bị chưa được chọn</value>
  </data>
  <data name="DeviceSelected" xml:space="preserve">
    <value>Đã chọn thiết bị "{0}"</value>
@@ -502,7 +502,7 @@
    <value>Đang cài đặt APK "{0}"</value>
  </data>
  <data name="NoDevicesFound" xml:space="preserve">
-    <value>Không tìm thấy thiết bị. Hãy đảm bảo rằng thiết bị của bạn đã được kết nối với máy tính và gỡ lỗi adb đã được bật. Nếu bạn đang sử dụng trình giả lập, hãy khởi động lại và chờ nó khởi động</value>
+    <value>Không tìm thấy thiết bị nào. Hãy chắc chắn rằng thiết bị của bạn được kết nối với máy tính và đã bật chế độ gỡ lỗi adb. Nếu bạn sử dụng trình giả lập, hãy khởi động lại và đợi cho đến khi nó khởi động xong</value>
  </data>
  <data name="TimeEnded" xml:space="preserve">
    <value>Thời gian kết thúc: {0}</value>
@@ -511,10 +511,10 @@
    <value>Thời gian bắt đầu: {0}</value>
  </data>
  <data name="ClearFrameworkPrompt" xml:space="preserve">
-    <value>Cần xóa bộ nhớ cache framework sau khi thay đổi phiên bản Apktool để tránh lỗi không mong muốn. Bạn có muốn xóa nó ngay bây giờ không?</value>
+    <value>Cần phải xóa bộ nhớ đệm của framework sau khi thay đổi phiên bản Apktool để tránh các lỗi không mong muốn. Bạn có muốn xóa ngay bây giờ không?</value>
  </data>
  <data name="ClearTempFolder" xml:space="preserve">
-    <value>Xóa thư mục tạm</value>
+    <value>Đang xóa thư mục tạm</value>
  </data>
  <data name="DeletingFolder" xml:space="preserve">
    <value>Đang xóa thư mục: {0}</value>
@@ -523,21 +523,24 @@
    <value>Thư mục "{0}" không tồn tại</value>
  </data>
  <data name="OpenComFolder" xml:space="preserve">
-    <value>Mở thư mục đầu ra đã biên dịch</value>
+    <value>Mở thư mục đầu ra biên dịch</value>
  </data>
  <data name="OpenDecFolder" xml:space="preserve">
-    <value>Mở thư mục đầu ra đã giải mã</value>
+    <value>Mở thư mục đầu ra dịch ngược</value>
  </data>
  <data name="FixApktoolYml" xml:space="preserve">
-    <value>Apktool.yml đã được sửa</value>
+    <value>Đã sửa tệp apktool.yml</value>
  </data>
  <data name="CopyFileTo" xml:space="preserve">
-    <value>Sao chép tệp "{0}" vào "{1}"</value>
+    <value>Sao chép tệp "{0}" đến "{1}"</value>
  </data>
  <data name="SplitApkNotFound" xml:space="preserve">
-    <value>Chưa chọn APK chia nhỏ</value>
+    <value>Split APK chưa được chọn</value>
  </data>
  <data name="CantDetectApkeditorVersion" xml:space="preserve">
    <value>Không thể phát hiện phiên bản APKEditor</value>
  </data>
-</root>
+  <data name="SetLanguageRestartApplication" xml:space="preserve">
+    <value />
+  </data>
+</root>
@@ -10,6 +10,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Text;
 using System.Windows.Forms;

 namespace APKToolGUI
@@ -17,7 +18,7 @@ namespace APKToolGUI
    static class Program
    {
        /// <summary>
-        /// Главная точка входа для приложения.
+        /// Main entry point for the application.
        /// </summary>
        [DllImport("Shcore.dll")]
        static extern int SetProcessDpiAwareness(int PROCESS_DPI_AWARENESS);
@@ -118,14 +119,7 @@ namespace APKToolGUI
        public static bool IsWin10OrAbove()
        {
            // Check if the operating system is Windows 10 or above
-            if (OSVersion.GetOSVersion().Version.Major >= 10 && OSVersion.GetOSVersion().Version.Minor >= 0)
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+            return OSVersion.GetOSVersion().Version.Major >= 10;
        }


@@ -141,38 +135,44 @@ namespace APKToolGUI
        public static void SetLanguage()
        {
            String settingsCulture = Settings.Default.Culture;
+            if (settingsCulture.Equals("Auto"))
+            {
+                // Let .NET handle the resource fallback process.
+                // It will automatically use the system's language if a satellite assembly is available,
+                // otherwise it will fall back to the neutral language defined in the main assembly (English).
+                return;
+            }
+
            try
            {
-                if (settingsCulture.Equals("Auto"))
-                {
-                    System.Threading.Thread.CurrentThread.CurrentUICulture = System.Globalization.CultureInfo.InstalledUICulture;
-                    System.Threading.Thread.CurrentThread.CurrentCulture = System.Globalization.CultureInfo.InstalledUICulture;
-                }
-                else
-                {
-                    System.Globalization.CultureInfo _settingsCulture = System.Globalization.CultureInfo.GetCultureInfo(settingsCulture);
-                    System.Threading.Thread.CurrentThread.CurrentUICulture = _settingsCulture;
-                    System.Threading.Thread.CurrentThread.CurrentCulture = _settingsCulture;
-                }
+                System.Globalization.CultureInfo culture = System.Globalization.CultureInfo.GetCultureInfo(settingsCulture);
+                System.Threading.Thread.CurrentThread.CurrentUICulture = culture;
+                System.Threading.Thread.CurrentThread.CurrentCulture = culture;
            }
-            catch
+            catch (System.Globalization.CultureNotFoundException ex)
            {
-
+                Debug.WriteLine($"[Program] Invalid culture '{settingsCulture}': {ex.Message}");
+                // Fall back to system default culture
+            }
+            catch (ArgumentException ex)
+            {
+                Debug.WriteLine($"[Program] Failed to set culture: {ex.Message}");
            }
        }

        private static bool FilesCheck()
        {
-            // проверка файлов
+            // File verification
            List<String> missigFiles = MissingFilesCheck();
            if (missigFiles.Count > 0)
            {
-                String files = Environment.NewLine;
+                StringBuilder filesBuilder = new StringBuilder();
+                filesBuilder.AppendLine();
                foreach (String file in missigFiles)
                {
-                    files += file + Environment.NewLine;
+                    filesBuilder.AppendLine(file);
                }
-                MessageBox.Show(Language.RequiredFilesMissing + files, Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show(Language.RequiredFilesMissing + filesBuilder.ToString(), Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Error);
                //Application.Exit();
                return false;
            }
@@ -2,35 +2,35 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;

-// Управление общими сведениями о сборке осуществляется с помощью 
-// набора атрибутов. Измените значения этих атрибутов, чтобы изменить сведения,
-// связанные со сборкой.
+// General information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
 [assembly: AssemblyTitle("APK Tool GUI")]
 [assembly: AssemblyDescription("GUI for apktool, signapk and zipalign utilities.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("APK Tool GUI")]
-[assembly: AssemblyCopyright("Original owner: INFINUM, 2012-2015 | Maintained by: AndnixSH, 2022-2024")]
+[assembly: AssemblyCopyright("Original owner: INFINUM, 2012-2015 | Maintained by: AndnixSH, 2022-2025")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

-// Параметр ComVisible со значением FALSE делает типы в сборке невидимыми 
-// для COM-компонентов.  Если требуется обратиться к типу в этой сборке через 
-// COM, задайте атрибуту ComVisible значение TRUE для этого типа.
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components. If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]

-// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM
+// The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("49ccb60c-22a6-4a25-a4bf-9208712ad928")]

-// Сведения о версии сборки состоят из следующих четырех значений:
+// Version information for an assembly consists of the following four values:
 //
-//      Основной номер версии
-//      Дополнительный номер версии 
-//      Номер построения
-//      Редакция
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
 //
-// Можно задать все значения или принять номер построения и номер редакции по умолчанию, 
-// используя "*", как показано ниже:
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.3.1.6")]
-[assembly: AssemblyFileVersion("3.3.1.6")]
+[assembly: AssemblyVersion("3.3.2.1")]
+[assembly: AssemblyFileVersion("3.3.2.1")]
@@ -12,7 +12,7 @@ namespace APKToolGUI.Properties {
    
    
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.12.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0")]
    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
        
        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -1011,7 +1011,7 @@ namespace APKToolGUI.Properties {
        [global::System.Configuration.UserScopedSettingAttribute()]
        [global::System.Configuration.SettingsProviderAttribute(typeof(Bluegrams.Application.PortableSettingsProvider))]
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("True")]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
        [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
        public bool Build_UseAapt2 {
            get {
@@ -216,7 +216,7 @@
      <Value Profile="(Default)">False</Value>
    </Setting>
    <Setting Name="Build_UseAapt2" Provider="Bluegrams.Application.PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
-      <Value Profile="(Default)">True</Value>
+      <Value Profile="(Default)">False</Value>
    </Setting>
    <Setting Name="PlaySoundWhenDone" Provider="Bluegrams.Application.PortableSettingsProvider" Roaming="true" Type="System.Boolean" Scope="User">
      <Value Profile="(Default)">False</Value>
@@ -17,7 +17,7 @@ namespace APKToolGUI.Utils
            {
                if (mf.Contains("<application"))
                {
-                    return StringExt.Regex(@"(?<=android:name=\"")(.*?)(?=\"")", mf);
+                    return StringExt.RegexExtract(@"(?<=android:name=\"")(.*?)(?=\"")", mf);
                }
            }
            return "";
@@ -31,11 +31,11 @@ namespace APKToolGUI.Utils
            foreach (string mf in Manifest)
            {
                if (String.IsNullOrEmpty(packageName))
-                    packageName = StringExt.Regex(@"(?<=package=\"")(.*?)(?=\"")", mf);
+                    packageName = StringExt.RegexExtract(@"(?<=package=\"")(.*?)(?=\"")", mf);

                if (mf.Contains("<activity"))
                {
-                    mainActivity = StringExt.Regex(@"(?<=android:name=\"")(.*?)(?=\"")", mf);
+                    mainActivity = StringExt.RegexExtract(@"(?<=android:name=\"")(.*?)(?=\"")", mf);
                }
                if (mf.Contains("android.intent.action.MAIN"))
                {
@@ -38,6 +38,12 @@ namespace SaveToGameWpf.Logic.Utils
        public static void CheckDragEnter(this DragEventArgs e, params string[] extensions)
        {
            string[] files = e.GetFilesDrop();
+            if (files.Length == 0)
+            {
+                e.Effect = DragDropEffects.None;
+                return;
+            }
+
            if (extensions == null && Directory.Exists(files[0]))
                e.Effect = DragDropEffects.Copy;
            else if (extensions != null && extensions.Any(ext => files[0].EndsWith(ext, StringComparison.Ordinal)))
@@ -49,12 +55,18 @@ namespace SaveToGameWpf.Logic.Utils
        public static bool CheckDragOver(this DragEventArgs e, params string[] extensions)
        {
            string[] files = e.GetFilesDrop();
+            if (files.Length == 0)
+            {
+                e.Effect = DragDropEffects.None;
+                return false;
+            }
+
            if (extensions == null && Directory.Exists(files[0]))
            {
                e.Effect = DragDropEffects.Move;
                return true;
            }
-            else if (files.Length == 1 && extensions.Any(ext => files[0].EndsWith(ext, StringComparison.Ordinal)))
+            else if (extensions != null && files.Length == 1 && extensions.Any(ext => files[0].EndsWith(ext, StringComparison.Ordinal)))
            {
                e.Effect = DragDropEffects.Move;
                return true;
@@ -68,6 +80,11 @@ namespace SaveToGameWpf.Logic.Utils
        public static bool CheckManyDragOver(this DragEventArgs e, params string[] extensions)
        {
            string[] files = e.GetFilesDrop();
+            if (files.Length == 0)
+            {
+                e.Effect = DragDropEffects.None;
+                return false;
+            }

            if (extensions == null && Directory.Exists(files[0]))
            {
@@ -87,6 +104,9 @@ namespace SaveToGameWpf.Logic.Utils
        public static bool DropOneByEnd(this DragEventArgs e, Action<string> onSuccess, params string[] extensions)
        {
            string[] files = e.GetFilesDrop();
+            if (files.Length == 0)
+                return false;
+
            if (extensions == null && Directory.Exists(files[0]))
            {
                onSuccess(files[0]);
@@ -103,6 +123,9 @@ namespace SaveToGameWpf.Logic.Utils

        public static bool DropManyByEnd(this DragEventArgs e, Action<string[]> onSuccess, params string[] extensions)
        {
+            if (extensions == null || extensions.Length == 0)
+                return false;
+
            foreach (string apk in extensions)
            {
                Debug.WriteLine(apk);
@@ -14,23 +14,45 @@ namespace APKToolGUI.Utils
        public static void KillAllProcessesSpawnedBy(UInt32 parentProcessId)
        {
            // NOTE: Process Ids are reused!
-            ManagementObjectSearcher searcher = new ManagementObjectSearcher(
+            using (ManagementObjectSearcher searcher = new ManagementObjectSearcher(
                "SELECT * " +
                "FROM Win32_Process " +
-                "WHERE ParentProcessId=" + parentProcessId);
-            ManagementObjectCollection collection = searcher.Get();
-            if (collection.Count > 0)
+                "WHERE ParentProcessId=" + parentProcessId))
            {
-                foreach (var item in collection)
+                using (ManagementObjectCollection collection = searcher.Get())
                {
-                    UInt32 childProcessId = (UInt32)item["ProcessId"];
-                    if ((int)childProcessId != Process.GetCurrentProcess().Id)
+                    if (collection.Count > 0)
                    {
-                        Debug.WriteLine($"Kill child process {childProcessId}");
-                        KillAllProcessesSpawnedBy(childProcessId);
+                        foreach (var item in collection)
+                        {
+                            UInt32 childProcessId = (UInt32)item["ProcessId"];
+                            if ((int)childProcessId != Process.GetCurrentProcess().Id)
+                            {
+                                Debug.WriteLine($"Kill child process {childProcessId}");

-                        Process childProcess = Process.GetProcessById((int)childProcessId);
-                        childProcess.Kill();
+                                // Recursively kill child processes
+                                KillAllProcessesSpawnedBy(childProcessId);
+
+                                // Kill and dispose the child process
+                                try
+                                {
+                                    using (Process childProcess = Process.GetProcessById((int)childProcessId))
+                                    {
+                                        childProcess.Kill();
+                                    }
+                                }
+                                catch (ArgumentException)
+                                {
+                                    // Process already exited
+                                    Debug.WriteLine($"Process {childProcessId} already exited");
+                                }
+                                catch (InvalidOperationException ex)
+                                {
+                                    // Process is terminating or has exited
+                                    Debug.WriteLine($"Process {childProcessId} is terminating: {ex.Message}");
+                                }
+                            }
+                        }
                    }
                }
            }
@@ -1,21 +1,40 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Threading.Tasks;

 namespace APKToolGUI.Utils
 {
    public static class StringExt
    {
-        static readonly Random random = new Random();
-
-        public static string Regex(string text, string match)
+        [ThreadStatic]
+        private static Random threadRandom;
+        
+        private static Random ThreadRandom
        {
-            Regex myRegex = new Regex(text);
-            Match matched = myRegex.Match(match);
+            get
+            {
+                if (threadRandom == null)
+                    threadRandom = new Random(unchecked(Environment.TickCount * 31 + Thread.CurrentThread.ManagedThreadId));
+                return threadRandom;
+            }
+        }
+
+        /// <summary>
+        /// Extracts a string from the input using the provided regex pattern.
+        /// </summary>
+        /// <param name="pattern">The regex pattern to match.</param>
+        /// <param name="input">The input string to search.</param>
+        /// <returns>The matched string or empty string if no match found.</returns>
+        public static string RegexExtract(string pattern, string input)
+        {
+            Regex regex = new Regex(pattern);
+            Match matched = regex.Match(input);
            return matched.ToString();
        }

@@ -23,14 +42,14 @@ namespace APKToolGUI.Utils
        {
            const string chars = "abcdefghijklmnopqrstuvwxyz";
            return new string(Enumerable.Repeat(chars, length)
-              .Select(s => s[random.Next(s.Length)]).ToArray());
+              .Select(s => s[ThreadRandom.Next(s.Length)]).ToArray());
        }

        public static string RandStrWithCaps(int length)
        {
            const string chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
            return new string(Enumerable.Repeat(chars, length)
-              .Select(s => s[random.Next(s.Length)]).ToArray());
+              .Select(s => s[ThreadRandom.Next(s.Length)]).ToArray());
        }

        /// <summary>
@@ -64,8 +83,14 @@ namespace APKToolGUI.Utils
                if (text.Length < 1) return text;
                return text.Remove(text.ToString().LastIndexOf(character), character.Length);
            }
-            catch
+            catch (ArgumentOutOfRangeException ex)
            {
+                Debug.WriteLine($"[StringExt] Character not found in text: {ex.Message}");
+                return text;
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"[StringExt] Failed to remove last character: {ex.Message}");
                return text;
            }
        }
@@ -221,7 +221,7 @@
                <value>False</value>
            </setting>
            <setting name="Build_UseAapt2" serializeAs="String">
-                <value>True</value>
+                <value>False</value>
            </setting>
            <setting name="PlaySoundWhenDone" serializeAs="String">
                <value>False</value>
@@ -308,7 +308,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="WinCopies.WindowsAPICodePack.Win32Native" publicKeyToken="ac0f4cf54a027a4d" culture="neutral" />
@@ -320,11 +320,11 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Bcl.HashCode" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -332,11 +332,11 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.10" newVersion="9.0.0.10" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Security.Permissions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.10" newVersion="9.0.0.10" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
@@ -2,7 +2,7 @@
 <packages>
  <package id="Costura.Fody" version="6.0.0" targetFramework="net48" developmentDependency="true" />
  <package id="DarkNet" version="2.3.0" targetFramework="net48" />
-  <package id="Fody" version="6.9.2" targetFramework="net48" developmentDependency="true" />
+  <package id="Fody" version="6.9.3" targetFramework="net48" developmentDependency="true" />
  <package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net48" />
  <package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net48" />
  <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net48" />
@@ -16,16 +16,16 @@
  <package id="Resource.Embedder" version="2.2.0" targetFramework="net48" />
  <package id="ResourceLoader" version="3.3.1" targetFramework="net48" />
  <package id="System.AppContext" version="4.3.0" targetFramework="net48" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net48" />
  <package id="System.Collections" version="4.3.0" targetFramework="net48" />
  <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net48" />
-  <package id="System.Collections.Immutable" version="9.0.3" targetFramework="net48" />
+  <package id="System.Collections.Immutable" version="9.0.10" targetFramework="net48" />
  <package id="System.Console" version="4.3.1" targetFramework="net48" />
  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net48" />
-  <package id="System.Diagnostics.DiagnosticSource" version="9.0.3" targetFramework="net48" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.10" targetFramework="net48" />
  <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net48" />
  <package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net48" />
-  <package id="System.Formats.Nrbf" version="9.0.3" targetFramework="net48" />
+  <package id="System.Formats.Nrbf" version="9.0.10" targetFramework="net48" />
  <package id="System.Globalization" version="4.3.0" targetFramework="net48" />
  <package id="System.Globalization.Calendars" version="4.3.0" targetFramework="net48" />
  <package id="System.IO" version="4.3.0" targetFramework="net48" />
@@ -33,20 +33,20 @@
  <package id="System.IO.FileSystem.Primitives" version="4.3.0" targetFramework="net48" />
  <package id="System.Linq" version="4.3.0" targetFramework="net48" />
  <package id="System.Linq.Expressions" version="4.3.0" targetFramework="net48" />
-  <package id="System.Memory" version="4.6.1" targetFramework="net48" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net48" />
  <package id="System.Net.Http" version="4.3.4" targetFramework="net48" />
  <package id="System.Net.Primitives" version="4.3.1" targetFramework="net48" />
  <package id="System.Net.Sockets" version="4.3.0" targetFramework="net48" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net48" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net48" />
  <package id="System.ObjectModel" version="4.3.0" targetFramework="net48" />
  <package id="System.Reflection" version="4.3.0" targetFramework="net48" />
  <package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net48" />
-  <package id="System.Reflection.Metadata" version="9.0.3" targetFramework="net48" />
+  <package id="System.Reflection.Metadata" version="9.0.10" targetFramework="net48" />
  <package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net48" />
-  <package id="System.Resources.Extensions" version="9.0.3" targetFramework="net48" />
+  <package id="System.Resources.Extensions" version="9.0.10" targetFramework="net48" />
  <package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net48" />
  <package id="System.Runtime" version="4.3.1" targetFramework="net48" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.1" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net48" />
  <package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net48" />
  <package id="System.Runtime.Handles" version="4.3.0" targetFramework="net48" />
  <package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net48" />
@@ -57,16 +57,16 @@
  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net48" />
  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net48" />
  <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net48" />
-  <package id="System.Security.Permissions" version="9.0.3" targetFramework="net48" />
+  <package id="System.Security.Permissions" version="9.0.10" targetFramework="net48" />
  <package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net48" />
  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net48" />
-  <package id="System.Text.Encoding.CodePages" version="9.0.3" targetFramework="net48" />
+  <package id="System.Text.Encoding.CodePages" version="9.0.10" targetFramework="net48" />
  <package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net48" />
  <package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net48" />
  <package id="System.Threading" version="4.3.0" targetFramework="net48" />
  <package id="System.Threading.Tasks" version="4.3.0" targetFramework="net48" />
  <package id="System.Threading.Timer" version="4.3.0" targetFramework="net48" />
-  <package id="System.ValueTuple" version="4.6.0" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net48" />
  <package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net48" />
  <package id="System.Xml.XDocument" version="4.3.0" targetFramework="net48" />
 </packages>
@@ -10,13 +10,13 @@ It is a tool for reverse engineering 3rd party, closed, binary Android apps. It
 # Download links
 https://github.com/AndnixSH/APKToolGUI/releases

-Any such report from your antivirus is a false positive and is due to how the application works. You must manually add APKToolGUI.exe to your antivirus's whitelist/exclusion list.
+Any alert from your antivirus regarding this application is a **false positive**, caused by how the application operates. To resolve this, manually add **APKToolGUI.exe** to your antivirus’s whitelist or exclusion list.

-If you don't believe this then try to compile the app by yourself or simply don't use it until you can confirm it is safe by working directly with your antiirus provider.
+If you remain unsure, you can compile the app yourself or refrain from using it until you confirm its safety with your antivirus provider.

 # Requirements
 - Windows 7 32-bit/64-bit and above
- [Java](https://www.java.com/en/) or [JDK](https://www.oracle.com/java/technologies/downloads/) 8 or above. Using latest JDK is not really necessary, it tends to cause unexpected issues. Java 8 and 17 (long-term support release) is enough. Use 64-bit version if your system is 64-bit
+- [Java](https://www.java.com/en/) or [JDK](https://www.oracle.com/java/technologies/downloads/) 8 or above. Using latest JDK is not really necessary. Java 8 and 25 (long-term support release) is enough. Use 64-bit version if your system is 64-bit
 - [.NET Framework 4.8](https://dotnet.microsoft.com/en-us/download/dotnet-framework/net48) (Windows 8 and above already have it preinstalled)

 # Features
@@ -75,40 +75,48 @@ For Framework/system apps related issues, check on [XDA Forum](https://forum.xda
 Anything else, [create a new issue](https://github.com/AndnixSH/APKToolGUI/issues)

 # FAQ
-##### Q: Can it be ported to other OS like Linux?
-A: Notthing is impossible, but it's not easy as long as Microsoft not supporting WinForm for other platforms, making .NET Core useless, unlike Java FX that supports other platforms since decades. If you know, feel free to open an issue. Until then, use [WineHQ](https://www.winehq.org/) or similar to run exe
+##### Can it be ported to macOS or Linux?
+Microsoft has not made it easy to port, and .NET Core remains impractical for this purpose. While I could use Avalonia UI as an alternative, I currently don’t have the time to port the entire project. Pull requests are welcome!

-##### Q: How to update Apktool?
-A: Download [Apktool.jar](https://github.com/iBotPeaches/Apktool/releases) and replace it on Resources folder
+In the meantime, you can use [WineHQ](https://www.winehq.org/) or similar tools to run the .exe file.

-##### Q: How to update Baksmali/Smali?
-A: Download [Baksmali.jar/Smali.jar](https://bitbucket.org/JesusFreke/smali/downloads/) and replace it on Resources folder
+##### How to update Apktool?
+Download [Apktool.jar](https://github.com/iBotPeaches/Apktool/releases) and replace it on Resources folder

-##### Q: How to reset?
-A: Simply delete the config.xml file from the directory of the executeable
+##### How to update Baksmali/Smali?
+Download [Baksmali.jar/Smali.jar](https://bitbucket.org/JesusFreke/smali/downloads/) and replace it on Resources folder

-##### Q: Can you make an automatic APK injecting tool?
-A: No, I'm not interested.
+##### How to reset?
+Simply delete the config.xml file from the directory of the executeable

-##### Q: Can you implement to convert APK to AAB?
-A: No, apktool is about recompiling, not converting to other formats. AAB is only used for distributing an application to Play Store, so it is not directly installable. If you really want to convert APK to ABB, try APK2AAB tool https://github.com/sensei-z/APK2AAB
+##### Can you help me with modding APKs in general?
+No, I do not provide support for APK modding.

-##### Q: I don't like split APK. Where can I get single APK instead?
-A: Download from [Apkcombo's APK downloader](https://apkcombo.com/downloader/), or [Apkpure](https://apkpure.com/) (Choose APK instead XAPK)
+##### Can you make an automatic APK injecting tool?
+No, I'm not interested.

-##### Q: Can you help me with modding APK in general?
-A: Sorry, I don't offer support with it.
+##### Can you implement APK to AAB conversion?
+No, APKTool is designed for decompiling and recompiling APKs, not for converting between formats. AAB (Android App Bundle) is used exclusively for distributing apps on the Google Play Store and is not directly installable on devices.

-##### Q: Can you implement features to protect/pack/obfuscate APK?
-A: No, APK protection is beyond the scope of this tool
+If you need to convert an APK to AAB, you can try using a tool like [APK2AAB](https://github.com/sensei-z/APK2AAB)

-##### Q: Can you implement features to deobfuscate/unpack APK or bypass anti-cheat/security?
-A: No, they are also beyond the scope of this tool. I don't condone bypassing such protections
+##### Can you implement features to protect, pack, or obfuscate APKs?
+No, APK protection is beyond the scope of this tool.
+
+##### Can you implement features to deobfuscate, unpack APKs, or bypass anti-cheat/security?
+No, these features are also beyond the scope of this tool. I do not support or condone bypassing such protections.

 # Development
 This project is written in C#

-Use Visual Studio 2019 and above. NET Framework 4.8 SDK is required
+Use Visual Studio 2022 and above. NET Framework 4.8 SDK is required
+
+# Contributing
+
+Contributions are welcome! Please ensure you:
+- Submit pull requests with clear, detailed descriptions.
+- Open an issue to discuss significant changes before implementing them.
+- Do not submit pull requests for bypass or protection features.

 # Credits
 - AndnixSH
@@ -1,3 +1,34 @@
+3.3.2.2
+- Updated APKEditor to 1.4.7
+- Updated Apktool to 3.0.1
+- Updated ADB to 37.0.0-14910828
+
+3.3.2.1
+- Updated APKEditor to 1.4.5
+- Updated Apktool to 2.12.1
+- Updated Aapt & Zipalign
+- Fixed *.zip and *.apkm not selectable for merging
+- Export image when clicking on icon box in APK Info
+
+3.3.2.0
+- Remove flickering fix due to tabs flickering in Russian language. I will look into WPF for modern UI instead
+- Updated tools (Apktool, APKEditor, AAPT, etc.) to latest versions
+- Fixed issues that *.zip and *.apkm are not selectable
+- Partially added Japanese language
+- Partially added Turkish language
+- Updated Vietnamese language
+- Updated German language
+
+Note: "Use Aapt2" must be disabled for Apktool 2.12.0 and above
+
+3.3.1.6
+- Fixed APK installation issue (Revert back to DotNetZip but using ProDotNetZip for fixed vulnerability)
+- Update packages
+- Reduced UI flickering
+- Removed APK links that are no longer available
+- Fixed icon not displaying. It will load icon from Play Store as a last resort
+- Faster apk parsing
+
 3.3.1.5
 - Updated Apktool and Apkeditor to latest version
 - Splitter between logs box and tab window is now draggable
Author	SHA1	Message	Date
AndnixSH	8f72cf9dee	Merge branch 'pr/48'	2026-05-03 13:17:37 +02:00
AndnixSH	79e8cd2ef9	Refactor + Add Apktool version checks	2026-05-03 11:56:56 +02:00
AndnixSH	5be8c9623a	Merge branch 'pr/49'	2026-04-28 17:56:14 +02:00
backryun	08fb90285c	ci: package artifact with exe/resources/changelog only	2026-03-05 20:56:43 +09:00
backryun	e0e99c862f	fix: correct signing/build option handling and drag-drop stability Use Sign_UseOutputDir in signing flows instead of Zipalign_UseOutputDir Fix apktool arg composition so -api and -j are both preserved Fix JarProcess JVM arg order and default java executable handling Replace non-functional splitTypes string replacement with Regex.Replace in ApkFixer Remove duplicate private-key click handler registration Fix APK info drag-drop target textbox and guard drag-drop helpers against empty drops Keep DEBUG/RELEASE catch split to avoid CS0168 in Release	2026-03-05 20:37:17 +09:00
backryun	cfb094a275	Update ADB, apktool, APKEditor	2026-03-05 20:11:35 +09:00
Aleksandr	ca58db1975	Update Russian localization	2026-02-16 10:39:19 +03:00
AndnixSH	5e6eee2f5e	Update README.md	2026-01-20 21:41:23 +01:00
AndnixSH	eb39b5bf69	Update README.md	2026-01-20 21:23:08 +01:00
AndnixSH	8230d8239d	Auto remove remaining split elements	2026-01-20 20:59:43 +01:00
AndnixSH	824aadbce1	Update changelog.txt	2025-11-26 17:39:45 +01:00
AndnixSH	e12fc939b9	Change version to 3.3.2.1	2025-11-26 17:37:03 +01:00
AndnixSH	0b043a4a3b	Merged some changes from #45 - Refactor language selection - Export image when clicking on icon box in APK Info - Build overflow	2025-11-25 21:48:22 +01:00
AndnixSH	f974e198d5	Refactor	2025-11-17 19:52:36 +01:00
AndnixSH	8c43f59bd1	Fix .zip and .apkm not selectable for merging #43	2025-11-15 11:37:57 +01:00
backryun	bd1dcf6f64	Refactoring Code(Last)	2025-11-05 01:01:37 +09:00
backryun	e0018909dc	Refactoring Code(Part 2)	2025-11-05 00:38:36 +09:00
backryun	580c49b59c	Refactoring Code(Part 1)	2025-10-20 06:58:03 +09:00
backryun	328736bbab	Add Android 36 string	2025-10-20 04:22:55 +09:00
backryun	a294aa5a40	Update aapt, zipalign	2025-10-20 04:15:36 +09:00
backryun	17289ff3f3	Update APKEditor & apktool	2025-10-20 04:11:53 +09:00
backryun	4471de12d5	Update Dependencys	2025-10-20 04:08:35 +09:00
backryun	469ccb6c9c	Fix build warning	2025-10-20 04:04:41 +09:00
AndnixSH	bfd2f41c88	Update changelog.txt	2025-08-02 17:18:03 +02:00
AndnixSH	6cda22c47e	Update AssemblyInfo.cs	2025-08-02 17:18:01 +02:00
AndnixSH	73dbd422a8	UI changes	2025-08-02 14:18:24 +02:00
AndnixSH	6411889613	Use aapt2 is false by default	2025-08-02 13:40:07 +02:00
AndnixSH	210390718c	Update FormMain.resx	2025-08-02 12:18:17 +02:00
AndnixSH	5704df951e	Update config.yml	2025-08-02 12:12:19 +02:00
AndnixSH	9e73936f6d	Update config.yml	2025-08-02 12:09:58 +02:00
AndnixSH	ddd24ecbd6	Update issue template	2025-08-02 12:06:51 +02:00
AndnixSH	e50b8a8658	Fixed issue #40	2025-08-02 11:59:15 +02:00
AndnixSH	5f242bca2f	Fixed apktool version output	2025-08-02 10:30:43 +02:00
AndnixSH	e2784ce65e	Updated tools	2025-08-02 10:29:56 +02:00
AndnixSH	93fc85fc33	Include Language.tr.resx in project	2025-07-30 19:12:09 +02:00
AndnixSH	4c389d58fb	Merge branch 'pr/37'	2025-07-30 19:10:04 +02:00
AndnixSH	63e08f4f77	Remove invalid Turkish resx files	2025-07-30 19:09:43 +02:00
AndnixSH	556d01ed74	Remove flickering fix due to tabs flickering #38	2025-07-29 21:54:38 +02:00
AndnixSH	eb670e7cd5	Merge branch 'pr/33'	2025-07-29 20:19:35 +02:00
AndnixSH	584df30992	Include Japanese in project	2025-07-29 20:19:14 +02:00
AndnixSH	e89522cfcb	Merge branch 'pr/36'	2025-07-29 19:31:13 +02:00
AndnixSH	9ffedd3cbf	Merge branch 'pr/39'	2025-07-29 18:31:20 +02:00
AndnixSH	7228e182cc	Update changelog.txt	2025-07-29 18:28:37 +02:00
Renji Yuusei	ecce2c8e18	Update FormSettings.vi-VN.resx	2025-06-16 00:33:12 +07:00
Renji Yuusei	5f83b05335	Update FormMain.vi-VN.resx	2025-06-16 00:31:14 +07:00
Renji Yuusei	aa0f62bd58	Update FormAboutBox.vi-VN.resx	2025-06-16 00:26:38 +07:00
Renji Yuusei	13420455c7	Update Language.vi-VN.resx	2025-06-15 21:15:18 +07:00
𝗛𝗼𝗹𝗶	3b90881083	Add Turkish	2025-03-27 17:01:03 +03:00
Hen_Ry	be7ed3a533	Update FormMain.de.resx	2025-03-22 18:31:59 +01:00
Re*Index. (ot_inc)	19bd457b65	Merge branch 'master' of https://github.com/reindex-ot/APKToolGUI	2025-02-17 07:41:11 +09:00
Re*Index. (ot_inc)	3e1fc75808	Update Language.ja.resx	2025-02-17 07:40:53 +09:00
Re*Index. (ot_inc)	846ef4f5f1	Update Language.ja.resx	2025-02-17 07:35:47 +09:00
Re*Index. (ot_inc)	d87d8af361	Delete APKToolGUI/Languages/Language.ja-JP.resx	2025-02-17 07:28:56 +09:00
Re*Index. (ot_inc)	9d31e8c2c8	Add files via upload	2025-02-17 07:28:23 +09:00
Re*Index. (ot_inc)	ecd8b45846	Add files via upload	2025-02-17 07:27:28 +09:00