diff --git a/win/setup/scanner/HanvonScan_App_Setup.iss b/win/setup/scanner/HanvonScan_App_Setup.iss
index ba1134f..26a4ad6 100644
--- a/win/setup/scanner/HanvonScan_App_Setup.iss
+++ b/win/setup/scanner/HanvonScan_App_Setup.iss
@@ -126,45 +126,45 @@ Source: "..\..\x64\OEM\hanvon\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion
 Source: "..\..\x64\OEM\hanvon\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
 
 ; twain32
-Source: "..\..\..\..\code_app\doc\scanner\HanvonScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\FormEx.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\GetPdf.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\GetRtf.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\GetXls.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\hanwangOCRdetect.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\hasp_windows_113819.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\HwOcrSdk.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\libzip.org.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\mp30.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\ofd.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\zlib.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\hanvon\sane.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\hanvon\scanner.dll"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\hanvon\hanvontwain1000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion;  Components: Twain1000;
-Source: "..\..\x86\OEM\hanvon\hanvontwain1002.ds"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion;  Components: Twain1002;
-Source: "..\..\x86\OEM\hanvon\hanvontwain7000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion;  Components: Twain7000;
-Source: "..\..\x86\OEM\hanvon\hanvontwain7002.ds"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion;  Components: Twain7002;
-Source: "..\..\x86\OEM\hanvon\hanvontwain7039.ds"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion;  Components: Twain7039;
-Source: "..\..\x86\OEM\hanvon\hanvontwain8000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion;  Components: Twain8000;
-Source: "..\..\x86\OEM\hanvon\hanvontwain9000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x86\"; Flags: ignoreversion;  Components: Twain9000;
+Source: "..\..\..\..\code_app\doc\scanner\HanvonScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\FormEx.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\GetPdf.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\GetRtf.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\GetXls.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\hanwangOCRdetect.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\hasp_windows_113819.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\HwOcrSdk.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\libzip.org.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\mp30.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\ofd.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\zlib.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\hanvon\sane.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\hanvon\scanner.dll"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\hanvon\hanvontwain1000.ds"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion;  Components: Twain1000;
+Source: "..\..\x86\OEM\hanvon\hanvontwain1002.ds"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion;  Components: Twain1002;
+Source: "..\..\x86\OEM\hanvon\hanvontwain7000.ds"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion;  Components: Twain7000;
+Source: "..\..\x86\OEM\hanvon\hanvontwain7002.ds"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion;  Components: Twain7002;
+Source: "..\..\x86\OEM\hanvon\hanvontwain7039.ds"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion;  Components: Twain7039;
+Source: "..\..\x86\OEM\hanvon\hanvontwain8000.ds"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion;  Components: Twain8000;
+Source: "..\..\x86\OEM\hanvon\hanvontwain9000.ds"; DestDir: "{win}\twain_32\HanvonTwain\"; Flags: ignoreversion;  Components: Twain9000;
 
 ; twain64
-Source: "..\..\x64\OEM\hanvon\hanvontwain1000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x64\"; Flags: ignoreversion;  Components: Twain1000; Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\hanvon\hanvontwain1002.ds"; DestDir: "{win}\twain_32\HanvonTwain\x64\"; Flags: ignoreversion;  Components: Twain1002; Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\hanvon\hanvontwain7000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x64\"; Flags: ignoreversion;  Components: Twain7000; Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\hanvon\hanvontwain7002.ds"; DestDir: "{win}\twain_32\HanvonTwain\x64\"; Flags: ignoreversion;  Components: Twain7002; Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\hanvon\hanvontwain7039.ds"; DestDir: "{win}\twain_32\HanvonTwain\x64\"; Flags: ignoreversion;  Components: Twain7039; Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\hanvon\hanvontwain8000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x64\"; Flags: ignoreversion;  Components: Twain8000; Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\hanvon\hanvontwain9000.ds"; DestDir: "{win}\twain_32\HanvonTwain\x64\"; Flags: ignoreversion;  Components: Twain9000; Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\hanvon\hanvontwain1000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion;  Components: Twain1000; Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\hanvon\hanvontwain1002.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion;  Components: Twain1002; Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\hanvon\hanvontwain7000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion;  Components: Twain7000; Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\hanvon\hanvontwain7002.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion;  Components: Twain7002; Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\hanvon\hanvontwain7039.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion;  Components: Twain7039; Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\hanvon\hanvontwain8000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion;  Components: Twain8000; Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\hanvon\hanvontwain9000.ds"; DestDir: "{win}\twain_64\HanvonTwain\"; Flags: ignoreversion;  Components: Twain9000; Check: Is64BitInstallMode
 
 ;¿½±´Çı¶¯
 Source: "..\..\usb\hanvon\hanvonusbscan.inf"; DestDir: "{app}\driver\";  Flags: ignoreversion recursesubdirs;
@@ -191,9 +191,9 @@ Root: HKLM; Subkey: "Software\HanvonScan"; ValueType: string; ValueName: "AppDir
 Root: HKLM; Subkey: "Software\HanvonScan"; ValueType: string; ValueName: "Application"; ValueData: "{app}\HanvonScan.exe"; Flags: uninsdeletekey
 Root: HKLM; Subkey: "Software\HanvonScan"; ValueType: string; ValueName: "AppVersion"; ValueData: "{#MyAppVersion}"; Flags: uninsdeletekey
 Root: HKLM; Subkey: "Software\HanvonScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: not Is64BitInstallMode
-Root: HKLM; Subkey: "Software\HanvonScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HanvonTwain\x86"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
+Root: HKLM; Subkey: "Software\HanvonScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HanvonTwain"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 Root: HKLM; Subkey: "Software\HanvonScan"; ValueType: string; ValueName: "DriverPath64"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
-Root: HKLM; Subkey: "Software\WOW6432Node\HanvonScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HanvonTwain\x86"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
+Root: HKLM; Subkey: "Software\WOW6432Node\HanvonScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HanvonTwain"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 Root: HKLM; Subkey: "Software\WOW6432Node\HanvonScan"; ValueType: string; ValueName: "DriverPath64"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 
 [Code]
@@ -261,6 +261,7 @@ begin
   begin
     DelTree(ExpandConstant('{app}'), True, True, True);
     DelTree(ExpandConstant('{win}\twain_32\HanvonTwain'), True, True, True);
+    DelTree(ExpandConstant('{win}\twain_64\HanvonTwain'), True, True, True);
   end;
  end;
 
diff --git a/win/setup/scanner/HuaGoScan_App_Setup.iss b/win/setup/scanner/HuaGoScan_App_Setup.iss
index 92b77e0..914c379 100644
--- a/win/setup/scanner/HuaGoScan_App_Setup.iss
+++ b/win/setup/scanner/HuaGoScan_App_Setup.iss
@@ -130,49 +130,49 @@ Source: "..\..\x64\OEM\huagao\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion
 Source: "..\..\x64\OEM\huagao\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
 
 ; twain32
-Source: "..\..\..\..\code_app\doc\scanner\HuaGoScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\FormEx.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\GetPdf.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\GetRtf.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\GetXls.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\hanwangOCRdetect.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\hasp_windows_113819.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\HwOcrSdk.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\libzip.org.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\mp30.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\ofd.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\zlib.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\huagao\sane.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\huagao\scanner.dll"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\huagao\huagaotwain100.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG100;
-Source: "..\..\x86\OEM\huagao\huagaotwain139.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG139;
-Source: "..\..\x86\OEM\huagao\huagaotwain200.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG200;
-Source: "..\..\x86\OEM\huagao\huagaotwain239.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG239;
-Source: "..\..\x86\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG300;
-Source: "..\..\x86\OEM\huagao\huagaotwain302.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG302;
-Source: "..\..\x86\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG400;
-Source: "..\..\x86\OEM\huagao\huagaotwain402.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG402;
-Source: "..\..\x86\OEM\huagao\huagaotwain439.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x86\"; Flags: ignoreversion;  Components: TwainG439;
+Source: "..\..\..\..\code_app\doc\scanner\HuaGoScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\hwusbdev.key"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\cnocr.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\doc_seg.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\ExportFile.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\FormEx.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\GetPdf.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\GetRtf.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\GetXls.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\hanwangOCRdetect.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\hasp_windows_113819.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\HwOcrSdk.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\libzip.org.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\mp30.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\ofd.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\PDFParse.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\tinyxml2.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\zlib.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\huagao\sane.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\huagao\scanner.dll"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\huagao\huagaotwain100.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG100;
+Source: "..\..\x86\OEM\huagao\huagaotwain139.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG139;
+Source: "..\..\x86\OEM\huagao\huagaotwain200.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG200;
+Source: "..\..\x86\OEM\huagao\huagaotwain239.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG239;
+Source: "..\..\x86\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG300;
+Source: "..\..\x86\OEM\huagao\huagaotwain302.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG302;
+Source: "..\..\x86\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG400;
+Source: "..\..\x86\OEM\huagao\huagaotwain402.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG402;
+Source: "..\..\x86\OEM\huagao\huagaotwain439.ds"; DestDir: "{win}\twain_32\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG439;
 
 ; twain64
-Source: "..\..\x64\OEM\huagao\huagaotwain100.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG100;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain139.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG139;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain200.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG200;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain239.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG239;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG300;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain302.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG302;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG400;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain402.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG402;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\huagao\huagaotwain439.ds"; DestDir: "{win}\twain_32\HuaGoTwain\x64\"; Flags: ignoreversion;  Components: TwainG439;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain100.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG100;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain139.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG139;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain200.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG200;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain239.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG239;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain300.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG300;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain302.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG302;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain400.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG400;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain402.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG402;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\huagao\huagaotwain439.ds"; DestDir: "{win}\twain_64\HuaGoTwain\"; Flags: ignoreversion;  Components: TwainG439;  Check: Is64BitInstallMode
 
 ;¿½±´Çı¶¯
 Source: "..\..\usb\huagao\huagaousb.inf"; DestDir: "{app}\driver\";  Flags: ignoreversion recursesubdirs;
@@ -199,9 +199,9 @@ Root: HKLM; Subkey: "Software\HuaGoScan"; ValueType: string; ValueName: "AppDire
 Root: HKLM; Subkey: "Software\HuaGoScan"; ValueType: string; ValueName: "Application"; ValueData: "{app}\HuaGoScan.exe"; Flags: uninsdeletekey
 Root: HKLM; Subkey: "Software\HuaGoScan"; ValueType: string; ValueName: "AppVersion"; ValueData: "{#MyAppVersion}"; Flags: uninsdeletekey
 Root: HKLM; Subkey: "Software\HuaGoScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: not Is64BitInstallMode
-Root: HKLM; Subkey: "Software\HuaGoScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HuaGoTwain\x86"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
+Root: HKLM; Subkey: "Software\HuaGoScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HuaGoTwain"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 Root: HKLM; Subkey: "Software\HuaGoScan"; ValueType: string; ValueName: "DriverPath64"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
-Root: HKLM; Subkey: "Software\WOW6432Node\HuaGoScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HuaGoTwain\x86"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
+Root: HKLM; Subkey: "Software\WOW6432Node\HuaGoScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\HuaGoTwain"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 Root: HKLM; Subkey: "Software\WOW6432Node\HuaGoScan"; ValueType: string; ValueName: "DriverPath64"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 
 [Code]
@@ -269,6 +269,7 @@ begin
   begin
     DelTree(ExpandConstant('{app}'), True, True, True);
     DelTree(ExpandConstant('{win}\twain_32\HuaGoTwain'), True, True, True);
+    DelTree(ExpandConstant('{win}\twain_64\HuaGoTwain'), True, True, True);
   end;
  end;
 
diff --git a/win/setup/scanner/LanxumScan_App_Setup.iss b/win/setup/scanner/LanxumScan_App_Setup.iss
index 691e4ac..ffd932b 100644
--- a/win/setup/scanner/LanxumScan_App_Setup.iss
+++ b/win/setup/scanner/LanxumScan_App_Setup.iss
@@ -95,32 +95,32 @@ Source: "..\..\x64\OEM\lanxum\sane.dll"; DestDir: "{app}\"; Flags: ignoreversion
 Source: "..\..\x64\OEM\lanxum\scanner.dll"; DestDir: "{app}\"; Flags: ignoreversion; Check: Is64BitInstallMode
 
 ; twain32
-Source: "..\..\..\..\code_app\doc\scanner\LanxumScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\lanxum\sane.dll"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\lanxum\scanner.dll"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8200.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8200;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8420.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8420;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8429.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8429;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8520.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8520;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8529.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8529;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8620.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8620;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8629.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8629;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8730;
-Source: "..\..\x86\OEM\lanxum\lanxumtwain8739.ds"; DestDir: "{win}\twain_32\LanxumTwain\x86\"; Flags: ignoreversion;  Components: Twain8739;
+Source: "..\..\..\..\code_app\doc\scanner\LanxumScan_scanSettings_Help_manual.pdf"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\msvcp140.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\vcruntime140.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\Release\concrt140.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\lanxum\sane.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\lanxum\scanner.dll"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8200.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8200;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8420.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8420;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8429.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8429;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8520.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8520;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8529.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8529;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8620.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8620;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8629.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8629;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8730;
+Source: "..\..\x86\OEM\lanxum\lanxumtwain8739.ds"; DestDir: "{win}\twain_32\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8739;
 
 ; twain64
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8200.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8200;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8420.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8420;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8429.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8429;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8520.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8520;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8529.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8529;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8620.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8620;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8629.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8629;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8730;  Check: Is64BitInstallMode
-Source: "..\..\x64\OEM\lanxum\lanxumtwain8739.ds"; DestDir: "{win}\twain_32\LanxumTwain\x64\"; Flags: ignoreversion;  Components: Twain8739;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8200.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8200;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8420.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8420;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8429.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8429;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8520.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8520;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8529.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8529;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8620.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8620;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8629.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8629;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8730.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8730;  Check: Is64BitInstallMode
+Source: "..\..\x64\OEM\lanxum\lanxumtwain8739.ds"; DestDir: "{win}\twain_64\LanxumTwain\"; Flags: ignoreversion;  Components: Twain8739;  Check: Is64BitInstallMode
 
 ;¿½±´Çı¶¯
 Source: "..\..\usb\lanxum\lanxumusb.inf"; DestDir: "{app}\driver\";  Flags: ignoreversion recursesubdirs;
@@ -146,9 +146,9 @@ Root: HKLM; Subkey: "Software\LanxumScan"; ValueType: string; ValueName: "AppDir
 Root: HKLM; Subkey: "Software\LanxumScan"; ValueType: string; ValueName: "Application"; ValueData: "{app}\LanxumScan.exe"; Flags: uninsdeletekey
 Root: HKLM; Subkey: "Software\LanxumScan"; ValueType: string; ValueName: "AppVersion"; ValueData: "{#MyAppVersion}"; Flags: uninsdeletekey
 Root: HKLM; Subkey: "Software\LanxumScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: not Is64BitInstallMode
-Root: HKLM; Subkey: "Software\LanxumScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\LanxumTwain\x86"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
+Root: HKLM; Subkey: "Software\LanxumScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\LanxumTwain"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 Root: HKLM; Subkey: "Software\LanxumScan"; ValueType: string; ValueName: "DriverPath64"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
-Root: HKLM; Subkey: "Software\WOW6432Node\LanxumScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\LanxumTwain\x86"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
+Root: HKLM; Subkey: "Software\WOW6432Node\LanxumScan"; ValueType: string; ValueName: "DriverPath"; ValueData: "{win}\twain_32\LanxumTwain"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 Root: HKLM; Subkey: "Software\WOW6432Node\LanxumScan"; ValueType: string; ValueName: "DriverPath64"; ValueData: "{app}"; Flags: uninsdeletekey;  Check: Is64BitInstallMode
 
 [Code]
@@ -216,6 +216,7 @@ begin
   begin
     DelTree(ExpandConstant('{app}'), True, True, True);
     DelTree(ExpandConstant('{win}\twain_32\LanxumTwain'), True, True, True);
+    DelTree(ExpandConstant('{win}\twain_64\LanxumTwain'), True, True, True);
   end;
  end;