diff --git a/README.md b/README.md
index eed67f9a79512268af8b7a707932f94415951426..d981974ff087d007ce24c9e2a34f704242eb0a2e 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Revoke China Certificates.<br />
 å…¨è‡ªåŠ¨å¯ç–‘è¯ä¹¦åŠé”€å·¥å…·/å…¨è‡ªå‹•å¯ç–‘æ†‘è‰æ’¤éŠ·å·¥å…·<br />
 
 ### Updated
-**2015-02-20**
+**2015-02-24**
 
 ### Type
 * Online Certificates/åœ¨çº¿è¯ä¹¦/åœ¨ç·šè‰æ›¸
@@ -35,9 +35,13 @@ Revoke China Certificates.<br />
 * [ç®€ä½“ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_Organization(Chinese_Simplified))
 * [ç¹é«”ä¸æ–‡](https://github.com/chengr28/RevokeChinaCerts/wiki/ReadMe_Organization(Chinese_Traditional))
 
+### Contributors
+* [Script to automatically disable for Mac OS X](https://github.com/QuantumGhost/RevokeChinaCerts/tree/master/Mac)
+* [SoftCertPolicyAppender](https://github.com/lhyqy5/RevokeChinaCerts/tree/master/Windows/SoftCertPolicyAppender)
+* [Android version of automated tools](https://github.com/phoeagon/RevokeChinaCerts/tree/master/Android)
+
 ### Thanks
-* [æ‹‰é»‘è¯ä¹¦ è®©ä½ çš„ç”µè„‘å†ä¹Ÿè£…ä¸ä¸ŠæŸäº›è½¯ä»¶ é™„è¯ä¹¦å¤§å…¨](http://blog.eqoe.cn/posts/ban-digital-cert.html)
 * [BlockChinaSoftware](https://github.com/SCFWSE/BlockChinaSoftware)
 * [UTLS-Blocker](https://github.com/SCFWSE/UTLS-Blocker)
+* [æ‹‰é»‘è¯ä¹¦ è®©ä½ çš„ç”µè„‘å†ä¹Ÿè£…ä¸ä¸ŠæŸäº›è½¯ä»¶ é™„è¯ä¹¦å¤§å…¨](http://blog.eqoe.cn/posts/ban-digital-cert.html)
 * [Local-Policy](https://bitbucket.org/MartinEden/local-policy/overview)
-* [SoftCertPolicyAppender](https://github.com/lhyqy5/RevokeChinaCerts/tree/master/Windows/SoftCertPolicyAppender)
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat
deleted file mode 100644
index 383cda699736579eefa21f166f608250fd044ba5..0000000000000000000000000000000000000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning.bat
+++ /dev/null
@@ -1,57 +0,0 @@
-:: RevokeChinaCerts CodeSigning batch
-:: Revoke China Certificates.
-:: 
-:: Author: Chengr28
-:: 
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\CodeSigning
-%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts CodeSigning version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat
deleted file mode 100644
index 3a8fb682abd57e738d386ae5aa7d449d97c154a0..0000000000000000000000000000000000000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Choice.bat
+++ /dev/null
@@ -1,210 +0,0 @@
-:: RevokeChinaCerts CodeSigning Choice batch
-:: Revoke China Certificates.
-:: 
-:: Author: Chengr28
-:: 
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\CodeSigning
-set /p UserChoice="Revoke WoSign Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-1
-%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-
-:CERT-1
-@echo.
-set /p UserChoice="Revoke WoTrust Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-2
-%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
-
-:CERT-2
-@echo.
-set /p UserChoice="Revoke 91.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-3
-%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
-
-:CERT-3
-@echo.
-set /p UserChoice="Revoke Baidu (China) Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-4
-%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
-
-:CERT-4
-@echo.
-set /p UserChoice="Revoke Beijing baidu Netcom science and technology co.ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-5
-%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-5
-@echo.
-set /p UserChoice="Revoke Beijing Baofeng Technology Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-6
-%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-6
-@echo.
-set /p UserChoice="Revoke Beijing Funshion Online Technologies Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-7
-%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
-
-:CERT-7
-@echo.
-set /p UserChoice="Revoke Beijing Kingsoft Security software Co.,Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-8
-%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
-
-:CERT-8
-@echo.
-set /p UserChoice="Revoke BEIJING KUWO TECHNOLOGY CO.,LTD.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-9
-%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
-
-:CERT-9
-@echo.
-set /p UserChoice="Revoke BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-10
-%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
-
-:CERT-10
-@echo.
-set /p UserChoice="Revoke Beijing Rising Information Technology Corporation Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-11
-%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
-
-:CERT-11
-@echo.
-set /p UserChoice="Revoke Beijing Sohu New Media Information Technology Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-12
-%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-12
-@echo.
-set /p UserChoice="Revoke Guangzhou Tieren Network Technology Co.,Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-13
-%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-13
-@echo.
-set /p UserChoice="Revoke Kingsoft Security Co.,Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-14
-%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
-
-:CERT-14
-@echo.
-set /p UserChoice="Revoke LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-15
-%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
-
-:CERT-15
-@echo.
-set /p UserChoice="Revoke Maxthon (Asia) Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-16
-%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
-
-:CERT-16
-@echo.
-set /p UserChoice="Revoke Meitu.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-17
-%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
-
-:CERT-17
-@echo.
-set /p UserChoice="Revoke NetEase(Hangzhou) Network Co. Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-18
-%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
-
-:CERT-18
-@echo.
-set /p UserChoice="Revoke PPLive Corporation? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-19
-%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
-
-:CERT-19
-@echo.
-set /p UserChoice="Revoke Qihoo 360 Software Beijing Company Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-20
-%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
-
-:CERT-20
-@echo.
-set /p UserChoice="Revoke Shanghai Quan Tudou Network Technology Co., Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-21
-%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-21
-@echo.
-set /p UserChoice="Revoke ShenZhen Xunlei Networking Technologies Ltd.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-22
-%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
-
-:CERT-22
-@echo.
-set /p UserChoice="Revoke TAOBAO (CHINA) SOFTWARE CO.,LTD.? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-23
-%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
-
-:CERT-23
-@echo.
-set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-24
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
-
-:CERT-24
-@echo.
-set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited(2010-01-26)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-25
-%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
-
-:CERT-25
-@echo.
-set /p UserChoice="Revoke UC Mobile Limited? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-26
-%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
-
-:CERT-26
-@echo.
-set /p UserChoice="Revoke Wandou Technology Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-27
-%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
-
-:CERT-27
-@echo.
-set /p UserChoice="Revoke Xiamen Yitianxia Network Technology Co., Ltd? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-28
-%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
-
-:CERT-28
-@echo.
-set /p UserChoice="Revoke Xiami.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-29
-%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
-
-:CERT-29
-@echo.
-set /p UserChoice="Revoke Ylmf.Com? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-30
-%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
-
-:CERT-30
-@echo.
-set /p UserChoice="Revoke YY Inc? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto Exit
-%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
-
-:: Print to screen.
-:Exit
-@echo.
-@echo RevokeChinaCerts CodeSigning Choice version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat b/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat
deleted file mode 100644
index 17e25dee15e55dcd9ed34c4d358c3539f099d36d..0000000000000000000000000000000000000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_CodeSigning_Restore.bat
+++ /dev/null
@@ -1,86 +0,0 @@
-:: RevokeChinaCerts CodeSigning Restore batch
-:: Revoke China Certificates.
-:: 
-:: Author: Chengr28
-:: 
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-
-:: Architecture check
-set CertMgr="%cd%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%cd%\Tools\CertMgr_x86"
-
-:: Restore certificates
-::  WoSign Code Signing Authority(UTN-USERFirst-Object)
-%CertMgr% -del -c -sha1 EA36152981E296F9763E1DC74B3262D3928563F8 -s Disallowed
-::  WoTrust Code Signing Authority(UTN-USERFirst-Object)
-%CertMgr% -del -c -sha1 B28CCC46D234A7D7CF7F21CCB9406F48A5273CC6 -s Disallowed
-::  91.Com
-%CertMgr% -del -c -sha1 E87D1C1D3FE2BCA700EB7B8DC0E45B97EAF19405 -s Disallowed
-::  Baidu (China) Co., Ltd.
-%CertMgr% -del -c -sha1 A34B70840C2B6F718877DDB1C2DE2C27F2C91C43 -s Disallowed
-::  Beijing baidu Netcom science and technology co.ltd
-%CertMgr% -del -c -sha1 D60C12D1FDB9E45551A00C8815CCD486C043945B -s Disallowed
-::  Beijing Baofeng Technology Co., Ltd.
-%CertMgr% -del -c -sha1 CB6F65314E5B25D61304AB2C9C8870B574CC21F5 -s Disallowed
-::  Beijing Funshion Online Technologies Ltd.
-%CertMgr% -del -c -sha1 9AB5445104C6CCE5A22431CF29C4331CBC328A1B -s Disallowed
-::  Beijing Kingsoft Security software Co.,Ltd
-%CertMgr% -del -c -sha1 E88DD1ACD2DB3A352072AA49C675F4944A3FEF82 -s Disallowed
-::  BEIJING KUWO TECHNOLOGY CO.,LTD.
-%CertMgr% -del -c -sha1 5FFFD1A3EAE5ED74558913C4A8476D1514C6D61F -s Disallowed
-::  BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.
-%CertMgr% -del -c -sha1 5DC57AF121E3101F4BFEA8A22BBDADC0869C80EE -s Disallowed
-::  Beijing Rising Information Technology Corporation Limited
-%CertMgr% -del -c -sha1 D9421BEDD9F5B8A91DD3F8691E7A42D83C983325 -s Disallowed
-::  Beijing Sohu New Media Information Technology Co., Ltd.
-%CertMgr% -del -c -sha1 D1BB252CAC3D250C55978F7EAAF121DA91A17B42 -s Disallowed
-::  Guangzhou Tieren Network Technology Co.,Ltd.
-%CertMgr% -del -c -sha1 2529C0C0D833806AFBFA3C31987C19A18722A2FE -s Disallowed
-::  Kingsoft Security Co.,Ltd
-%CertMgr% -del -c -sha1 2BDEC50B4446652C126709A08248E572B859CCCC -s Disallowed
-::  LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING
-%CertMgr% -del -c -sha1 62DF2BC4B5902B52C215C697D06038E3B28CF5D3 -s Disallowed
-::  Maxthon (Asia) Limited
-%CertMgr% -del -c -sha1 1481414E8E87412A00D3341167FE3A92C681B830 -s Disallowed
-::  Meitu.Com
-%CertMgr% -del -c -sha1 7B6FAE77BD19FEC5410293344B36124774A6D8F1 -s Disallowed
-::  NetEase(Hangzhou) Network Co. Ltd.
-%CertMgr% -del -c -sha1 E0387F3AF5752A4620EC617C39153C0E666CF5F8 -s Disallowed
-::  PPLive Corporation
-%CertMgr% -del -c -sha1 5477E38783CD37B1E5729B15D7C0873A2D72DB9D -s Disallowed
-::  Qihoo 360 Software Beijing Company Limited
-%CertMgr% -del -c -sha1 1E5BB77FCB63F26277F95AAE09B852699327A08A -s Disallowed
-::  Shanghai Quan Tudou Network Technology Co., Ltd.
-%CertMgr% -del -c -sha1 935140881F50BDF775D3CEF034C0D21C18FD2567 -s Disallowed
-::  ShenZhen Xunlei Networking Technologies Ltd.
-%CertMgr% -del -c -sha1 4099665730474153EADF671B8B475C03C08A46D0 -s Disallowed
-::  TAOBAO (CHINA) SOFTWARE CO.,LTD.
-%CertMgr% -del -c -sha1 E5777A69CAFD7F7C6F89C5297DD1159C7AE9B881 -s Disallowed
-::  Tencent Technology Shenzhen Company Limited
-%CertMgr% -del -c -sha1 2FDD445591CD2EEDBEF8B8A281896A59C08B3DC9 -s Disallowed
-::  Tencent Technology Shenzhen Company Limited(2010-01-26)
-%CertMgr% -del -c -sha1 8B46390D86B891E5A3D3AAB2B00D6FDB27A0F791 -s Disallowed
-::  UC Mobile Limited
-%CertMgr% -del -c -sha1 1540C77B5D19FC5A71A04DB001488E55B45DDC7F -s Disallowed
-::  Wandou Technology Ltd
-%CertMgr% -del -c -sha1 AB09D1AFE555CFC580575F5BC78B16B9F1C4E432 -s Disallowed
-::  Xiamen Yitianxia Network Technology Co., Ltd
-%CertMgr% -del -c -sha1 F49A648C69C2F01A0FDEB3992C5AE0A14D5AD9FC -s Disallowed
-::  Xiami.Com
-%CertMgr% -del -c -sha1 EEC507F719D5BA0CB913F034E045A24A509D8A5F -s Disallowed
-::  Ylmf.Com
-%CertMgr% -del -c -sha1 93A77CA50F165A5873DD3995874867B616AB3644 -s Disallowed
-::  YY Inc
-%CertMgr% -del -c -sha1 B3B89CD7940DC67E4291A3EE767AC17A3BC9E620 -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts CodeSigning Restore version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat b/Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat
deleted file mode 100644
index 0c3e97ca0b59bddb1c43d885ffaa8ed781f620c7..0000000000000000000000000000000000000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_Organization.bat
+++ /dev/null
@@ -1,56 +0,0 @@
-:: RevokeChinaCerts Organization batch
-:: Revoke China Certificates.
-:: 
-:: Author: Chengr28
-:: 
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\Organization
-%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
-%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Organization version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat b/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat
deleted file mode 100644
index 329680ed380d118b61d055a3298586acb364a60a..0000000000000000000000000000000000000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Choice.bat
+++ /dev/null
@@ -1,204 +0,0 @@
-:: RevokeChinaCerts Organization Choice batch
-:: Revoke China Certificates.
-:: 
-:: Author: Chengr28
-:: 
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-set Folder=%cd%
-
-:: Architecture check
-set CertMgr="%Folder%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%Folder%\Tools\CertMgr_x86"
-
-:: Add certificates to CRL
-set Folder=%Folder%\ArchiveCerts\Organization
-set /p UserChoice="Revoke ABC? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-1
-%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
-
-:CERT-1
-@echo.
-set /p UserChoice="Revoke ABC TEST CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-2
-%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
-
-:CERT-2
-@echo.
-set /p UserChoice="Revoke ABC2048? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-3
-%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
-
-:CERT-3
-@echo.
-set /p UserChoice="Revoke Alibaba.com Corporation Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-4
-%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
-
-:CERT-4
-@echo.
-set /p UserChoice="Revoke ALIPAY_ROOT? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-5
-%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
-
-:CERT-5
-@echo.
-set /p UserChoice="Revoke Alipay Trust NetWork? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-6
-%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
-
-:CERT-6
-@echo.
-set /p UserChoice="Revoke BOCOMCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-7
-%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
-
-:CERT-7
-@echo.
-set /p UserChoice="Revoke CCB CA ROOT(1999-06-29)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-8
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
-
-:CERT-8
-@echo.
-set /p UserChoice="Revoke CCB CA ROOT(2009-06-01)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-9
-%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
-
-:CERT-9
-@echo.
-set /p UserChoice="Revoke CFCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-10
-%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
-
-:CERT-10
-@echo.
-set /p UserChoice="Revoke CFCA CS CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-11
-%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
-
-:CERT-11
-@echo.
-set /p UserChoice="Revoke CFCA CS TEST CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-12
-%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
-
-:CERT-12
-@echo.
-set /p UserChoice="Revoke CFCA Operation CA3? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-13
-%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
-
-:CERT-13
-@echo.
-set /p UserChoice="Revoke CFCA RCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-14
-%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
-
-:CERT-14
-@echo.
-set /p UserChoice="Revoke CFCA Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-15
-%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
-
-:CERT-15
-@echo.
-set /p UserChoice="Revoke CFCA RSA RCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-16
-%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
-
-:CERT-16
-@echo.
-set /p UserChoice="Revoke China Trust Network(1)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-17
-%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
-
-:CERT-17
-@echo.
-set /p UserChoice="Revoke China Trust Network(2)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-18
-%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
-
-:CERT-18
-@echo.
-set /p UserChoice="Revoke China Trust Network(3)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-19
-%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
-
-:CERT-19
-@echo.
-set /p UserChoice="Revoke ICBC? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-20
-%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
-
-:CERT-20
-@echo.
-set /p UserChoice="Revoke ICBC Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-21
-%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
-
-:CERT-21
-@echo.
-set /p UserChoice="Revoke IcbcCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-22
-%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
-
-:CERT-22
-@echo.
-set /p UserChoice="Revoke iTruschina CN Root CA(1)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-23
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
-
-:CERT-23
-@echo.
-set /p UserChoice="Revoke iTruschina CN Root CA(2)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-24
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
-
-:CERT-24
-@echo.
-set /p UserChoice="Revoke iTruschina CN Root CA(3)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-25
-%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
-
-:CERT-25
-@echo.
-set /p UserChoice="Revoke Personal ICBC CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-26
-%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
-
-:CERT-26
-@echo.
-set /p UserChoice="Revoke ROOTCA OSCCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-27
-%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
-
-:CERT-27
-@echo.
-set /p UserChoice="Revoke SZCA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-28
-%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
-
-:CERT-28
-@echo.
-set /p UserChoice="Revoke SZCA(20030722)? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto CERT-29
-%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
-
-:CERT-29
-@echo.
-set /p UserChoice="Revoke TenpayCom Root CA? [Y/N]"
-if /i not "%UserChoice%" == "Y" goto Exit
-%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
-
-:: Print to screen.
-:Exit
-@echo.
-@echo RevokeChinaCerts Organization Choice version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat b/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat
deleted file mode 100644
index c038986c1493b3d6fce967fcaa7d23df370c25b6..0000000000000000000000000000000000000000
--- a/Windows/ArchiveCerts/RevokeChinaCerts_Organization_Restore.bat
+++ /dev/null
@@ -1,84 +0,0 @@
-:: RevokeChinaCerts Organization Restore batch
-:: Revoke China Certificates.
-:: 
-:: Author: Chengr28
-:: 
-
-@echo off
-
-:: Folder location
-cd /d %~dp0
-cd..
-
-:: Architecture check
-set CertMgr="%cd%\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%cd%\Tools\CertMgr_x86"
-
-:: Restore certificates
-::  ABC
-%CertMgr% -del -c -sha1 78D0CDF5752D1E5B58A674644CFE3499BF02F9EF -s Disallowed
-::  ABC TEST CA
-%CertMgr% -del -c -sha1 F18C39F8B5A3E9BADC811BBA7690E8D0143BD851 -s Disallowed
-::  ABC2048
-%CertMgr% -del -c -sha1 6FAE9AD81467C5FCB93574670F52C8EF538F8B6D -s Disallowed
-::  Alibaba.com Corporation Root CA
-%CertMgr% -del -c -sha1 A7217F919843199C958C128449DD52D2723B0A8A -s Disallowed
-::  ALIPAY_ROOT
-%CertMgr% -del -c -sha1 59864294A96B3E5C37C058E9D1FBDE5FF0C2E4EE -s Disallowed
-::  Alipay Trust NetWork
-%CertMgr% -del -c -sha1 89A2FB0E332BA7275FE712FEC669D746125B1F32 -s Disallowed
-::  BOCOMCA
-%CertMgr% -del -c -sha1 4571466B830EAC5FCDC22103B9733C1A15CE78AC -s Disallowed
-::  CCB CA ROOT(1999-06-29)
-%CertMgr% -del -c -sha1 3018E5D74DF29E3590F5BB8DF01AA7FC116BB4DE -s Disallowed
-::  CCB CA ROOT(2009-06-01)
-%CertMgr% -del -c -sha1 8582B4AF7491B3D16636EEB32D44993D7DEE6C40 -s Disallowed
-::  CFCA
-%CertMgr% -del -c -sha1 A9743B713E4109381622D3689AB5D9E1DC51B164 -s Disallowed
-::  CFCA CS CA
-%CertMgr% -del -c -sha1 D3FBFAA8A67FC9A2EADBF86AEB5D07A9D6AF322E -s Disallowed
-::  CFCA CS TEST CA
-%CertMgr% -del -c -sha1 B5DCF1C58E86DBED2EA2D217A5C28D11FD9254F0 -s Disallowed
-::  CFCA Operation CA3
-%CertMgr% -del -c -sha1 5A3A3EA74AE5D29F25A670024949869D1222E42A -s Disallowed
-::  CFCA RCA
-%CertMgr% -del -c -sha1 AE73DFF81CF24E50DD52CA1496E7EF94876061CB -s Disallowed
-::  CFCA Root CA
-%CertMgr% -del -c -sha1 31BD6AEF73031C5A49338E7A06040DD815EF7512 -s Disallowed
-::  CFCA RSA RCA
-%CertMgr% -del -c -sha1 57C5CEBB53FBF181E0B13977AF864F1C13F11AA9 -s Disallowed
-::  China Trust Network(1)
-%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s Disallowed
-::  China Trust Network(2)
-%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s Disallowed
-::  China Trust Network(3)
-%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s Disallowed
-::  ICBC
-%CertMgr% -del -c -sha1 E3F9043072BABF5E9C631960B34CCCF9FFC8BA41 -s Disallowed
-::  ICBC Root CA
-%CertMgr% -del -c -sha1 5A960203C10CFA8D42DD115B61154F98E2F617F7 -s Disallowed
-::  IcbcCA
-%CertMgr% -del -c -sha1 A02A23D13576ECA35498DC69166A20651E203E31 -s Disallowed
-::  iTruschina CN Root CA(1)
-%CertMgr% -del -c -sha1 240A61A2577970625B9F0B81283C4AA4037217B1 -s Disallowed
-::  iTruschina CN Root CA(2)
-%CertMgr% -del -c -sha1 46F168AF009C28C18F452EB85F5E8747892B3C8B -s Disallowed
-::  iTruschina CN Root CA(3)
-%CertMgr% -del -c -sha1 654E9FADD2032AE1B87D6263AF04FD7FEE38D57C -s Disallowed
-::  Personal ICBC CA
-%CertMgr% -del -c -sha1 2ABC81B0D7D052F887965562BB10AA66A80F7674 -s Disallowed
-::  ROOTCA OSCCA
-%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
-::  SZCA
-%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s Disallowed
-::  SZCA(20030722)
-%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s Disallowed
-::  TenpayCom Root CA
-%CertMgr% -del -c -sha1 56502166C0DE2488950491C90C7560E0E7AA7378 -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Organization Restore version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/SoftCertPolicyAppender.exe b/Windows/ArchiveCerts/SoftCertPolicyAppender/SoftCertPolicyAppender.exe
deleted file mode 100644
index 956377c4dc666dc077a01d27e453e21b961352ad..0000000000000000000000000000000000000000
Binary files a/Windows/ArchiveCerts/SoftCertPolicyAppender/SoftCertPolicyAppender.exe and /dev/null differ
diff --git a/Windows/ArchiveCerts/CodeSigning/91Com.crt b/Windows/Certs/CodeSigning/91Com.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/91Com.crt
rename to Windows/Certs/CodeSigning/91Com.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt b/Windows/Certs/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt
rename to Windows/Certs/CodeSigning/BEIJING_KUWO_TECHNOLOGY_COLTD.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt b/Windows/Certs/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt
rename to Windows/Certs/CodeSigning/BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Baidu_China_CoLtd.crt b/Windows/Certs/CodeSigning/Baidu_China_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Baidu_China_CoLtd.crt
rename to Windows/Certs/CodeSigning/Baidu_China_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Baofeng_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt b/Windows/Certs/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt
rename to Windows/Certs/CodeSigning/Beijing_Funshion_Online_Technologies_Ltd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Kingsoft_Security_Software_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt b/Windows/Certs/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt
rename to Windows/Certs/CodeSigning/Beijing_Rising_Information_Technology_Corporation_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Guangzhou_Tieren_Network_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Kingsoft_Security_CoLtd.crt b/Windows/Certs/CodeSigning/Kingsoft_Security_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Kingsoft_Security_CoLtd.crt
rename to Windows/Certs/CodeSigning/Kingsoft_Security_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt b/Windows/Certs/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt
rename to Windows/Certs/CodeSigning/LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Maxthon_Asia_Limited.crt b/Windows/Certs/CodeSigning/Maxthon_Asia_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Maxthon_Asia_Limited.crt
rename to Windows/Certs/CodeSigning/Maxthon_Asia_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/MeituCom.crt b/Windows/Certs/CodeSigning/MeituCom.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/MeituCom.crt
rename to Windows/Certs/CodeSigning/MeituCom.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt b/Windows/Certs/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt
rename to Windows/Certs/CodeSigning/NetEase_Hangzhou_Network_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/PPLive_Corporation.crt b/Windows/Certs/CodeSigning/PPLive_Corporation.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/PPLive_Corporation.crt
rename to Windows/Certs/CodeSigning/PPLive_Corporation.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt b/Windows/Certs/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt
rename to Windows/Certs/CodeSigning/Qihoo_360_Software_Beijing_Company_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt b/Windows/Certs/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt
rename to Windows/Certs/CodeSigning/ShenZhen_Xunlei_Networking_Technologies_Ltd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt b/Windows/Certs/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt
rename to Windows/Certs/CodeSigning/TAOBAO_CHINA_SOFTWARE_COLTD.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt b/Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt
rename to Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt b/Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt
rename to Windows/Certs/CodeSigning/Tencent_Technology_Shenzhen_Company_Limited_201001.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/UC_Mobile_Limited.crt b/Windows/Certs/CodeSigning/UC_Mobile_Limited.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/UC_Mobile_Limited.crt
rename to Windows/Certs/CodeSigning/UC_Mobile_Limited.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Wandou_Technology_Ltd.crt b/Windows/Certs/CodeSigning/Wandou_Technology_Ltd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Wandou_Technology_Ltd.crt
rename to Windows/Certs/CodeSigning/Wandou_Technology_Ltd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt b/Windows/Certs/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt
rename to Windows/Certs/CodeSigning/WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt b/Windows/Certs/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt
rename to Windows/Certs/CodeSigning/WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt b/Windows/Certs/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt
rename to Windows/Certs/CodeSigning/Xiamen_Yitianxia_Network_Technology_CoLtd.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/XiamiCom.crt b/Windows/Certs/CodeSigning/XiamiCom.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/XiamiCom.crt
rename to Windows/Certs/CodeSigning/XiamiCom.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/YY_Inc.crt b/Windows/Certs/CodeSigning/YY_Inc.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/YY_Inc.crt
rename to Windows/Certs/CodeSigning/YY_Inc.crt
diff --git a/Windows/ArchiveCerts/CodeSigning/YlmfCom.crt b/Windows/Certs/CodeSigning/YlmfCom.crt
similarity index 100%
rename from Windows/ArchiveCerts/CodeSigning/YlmfCom.crt
rename to Windows/Certs/CodeSigning/YlmfCom.crt
diff --git a/Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt b/Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
rename to Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_200702.crt
diff --git a/Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt b/Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
rename to Windows/Certs/Online/Autoridad_de_Certificacion_Raiz_del_Estado_Venezolano_201012.crt
diff --git a/Windows/Certs/CFCA_EV_ROOT.crt b/Windows/Certs/Online/CFCA_EV_ROOT.crt
similarity index 100%
rename from Windows/Certs/CFCA_EV_ROOT.crt
rename to Windows/Certs/Online/CFCA_EV_ROOT.crt
diff --git a/Windows/Certs/CFCA_GT_CA_201106.crt b/Windows/Certs/Online/CFCA_GT_CA_201106.crt
similarity index 100%
rename from Windows/Certs/CFCA_GT_CA_201106.crt
rename to Windows/Certs/Online/CFCA_GT_CA_201106.crt
diff --git a/Windows/Certs/CFCA_GT_CA_201208.crt b/Windows/Certs/Online/CFCA_GT_CA_201208.crt
similarity index 100%
rename from Windows/Certs/CFCA_GT_CA_201208.crt
rename to Windows/Certs/Online/CFCA_GT_CA_201208.crt
diff --git a/Windows/Certs/CNNIC_ROOT.crt b/Windows/Certs/Online/CNNIC_ROOT.crt
similarity index 100%
rename from Windows/Certs/CNNIC_ROOT.crt
rename to Windows/Certs/Online/CNNIC_ROOT.crt
diff --git a/Windows/Certs/CNNIC_SSL_Entrust.crt b/Windows/Certs/Online/CNNIC_SSL_Entrust.crt
similarity index 100%
rename from Windows/Certs/CNNIC_SSL_Entrust.crt
rename to Windows/Certs/Online/CNNIC_SSL_Entrust.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_200908.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_200908.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_200908.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_200908.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_Chinese.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_Chinese.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_Chinese_StartCom.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese_StartCom.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_Chinese_StartCom.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_Chinese_StartCom.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_StartCom_200609.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_200609.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_StartCom_200609.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_200609.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_1.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_1.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_1.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_1.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_2.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_2.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_StartCom_201103_2.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_StartCom_201103_2.crt
diff --git a/Windows/Certs/Certification_Authority_Of_WoSign_USERTrust.crt b/Windows/Certs/Online/Certification_Authority_Of_WoSign_USERTrust.crt
similarity index 100%
rename from Windows/Certs/Certification_Authority_Of_WoSign_USERTrust.crt
rename to Windows/Certs/Online/Certification_Authority_Of_WoSign_USERTrust.crt
diff --git a/Windows/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.crt b/Windows/Certs/Online/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
similarity index 100%
rename from Windows/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
rename to Windows/Certs/Online/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
diff --git a/Windows/Certs/Class_1_Primary_CA.crt b/Windows/Certs/Online/Class_1_Primary_CA.crt
similarity index 100%
rename from Windows/Certs/Class_1_Primary_CA.crt
rename to Windows/Certs/Online/Class_1_Primary_CA.crt
diff --git a/Windows/Certs/GiantRootCA.crt b/Windows/Certs/Online/GiantRootCA.crt
similarity index 100%
rename from Windows/Certs/GiantRootCA.crt
rename to Windows/Certs/Online/GiantRootCA.crt
diff --git a/Windows/Certs/Government_Root_Certification_Authority.crt b/Windows/Certs/Online/Government_Root_Certification_Authority.crt
similarity index 100%
rename from Windows/Certs/Government_Root_Certification_Authority.crt
rename to Windows/Certs/Online/Government_Root_Certification_Authority.crt
diff --git a/Windows/Certs/Hongkong_Post_Root_CA.crt b/Windows/Certs/Online/Hongkong_Post_Root_CA.crt
similarity index 100%
rename from Windows/Certs/Hongkong_Post_Root_CA.crt
rename to Windows/Certs/Online/Hongkong_Post_Root_CA.crt
diff --git a/Windows/Certs/Hongkong_Post_Root_CA_1.crt b/Windows/Certs/Online/Hongkong_Post_Root_CA_1.crt
similarity index 100%
rename from Windows/Certs/Hongkong_Post_Root_CA_1.crt
rename to Windows/Certs/Online/Hongkong_Post_Root_CA_1.crt
diff --git a/Windows/Certs/JGZXCA.crt b/Windows/Certs/Online/JGZXCA.crt
similarity index 100%
rename from Windows/Certs/JGZXCA.crt
rename to Windows/Certs/Online/JGZXCA.crt
diff --git a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt b/Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority.crt
similarity index 100%
rename from Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt
rename to Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority.crt
diff --git a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt b/Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
similarity index 100%
rename from Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
rename to Windows/Certs/Online/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
diff --git a/Windows/Certs/SRCA.crt b/Windows/Certs/Online/SRCA.crt
similarity index 100%
rename from Windows/Certs/SRCA.crt
rename to Windows/Certs/Online/SRCA.crt
diff --git a/Windows/Certs/Superfish_Inc.crt b/Windows/Certs/Online/Superfish_Inc.crt
similarity index 100%
rename from Windows/Certs/Superfish_Inc.crt
rename to Windows/Certs/Online/Superfish_Inc.crt
diff --git a/Windows/Certs/TWCA_Global_Root_CA.crt b/Windows/Certs/Online/TWCA_Global_Root_CA.crt
similarity index 100%
rename from Windows/Certs/TWCA_Global_Root_CA.crt
rename to Windows/Certs/Online/TWCA_Global_Root_CA.crt
diff --git a/Windows/Certs/TWCA_Root_Certification_Authority_1.crt b/Windows/Certs/Online/TWCA_Root_Certification_Authority_1.crt
similarity index 100%
rename from Windows/Certs/TWCA_Root_Certification_Authority_1.crt
rename to Windows/Certs/Online/TWCA_Root_Certification_Authority_1.crt
diff --git a/Windows/Certs/TWCA_Root_Certification_Authority_2.crt b/Windows/Certs/Online/TWCA_Root_Certification_Authority_2.crt
similarity index 100%
rename from Windows/Certs/TWCA_Root_Certification_Authority_2.crt
rename to Windows/Certs/Online/TWCA_Root_Certification_Authority_2.crt
diff --git a/Windows/Certs/TWCA_Secure_CA_Baltimore.crt b/Windows/Certs/Online/TWCA_Secure_CA_Baltimore.crt
similarity index 100%
rename from Windows/Certs/TWCA_Secure_CA_Baltimore.crt
rename to Windows/Certs/Online/TWCA_Secure_CA_Baltimore.crt
diff --git a/Windows/Certs/TWCA_Secure_Certification_Authority_USERTrust.crt b/Windows/Certs/Online/TWCA_Secure_Certification_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/TWCA_Secure_Certification_Authority_USERTrust.crt
rename to Windows/Certs/Online/TWCA_Secure_Certification_Authority_USERTrust.crt
diff --git a/Windows/Certs/TaiCA_Secure_CA_GTE.crt b/Windows/Certs/Online/TaiCA_Secure_CA_GTE.crt
similarity index 100%
rename from Windows/Certs/TaiCA_Secure_CA_GTE.crt
rename to Windows/Certs/Online/TaiCA_Secure_CA_GTE.crt
diff --git a/Windows/Certs/UCA_Extended_Validation_Root.crt b/Windows/Certs/Online/UCA_Extended_Validation_Root.crt
similarity index 100%
rename from Windows/Certs/UCA_Extended_Validation_Root.crt
rename to Windows/Certs/Online/UCA_Extended_Validation_Root.crt
diff --git a/Windows/Certs/UCA_Global_Root.crt b/Windows/Certs/Online/UCA_Global_Root.crt
similarity index 100%
rename from Windows/Certs/UCA_Global_Root.crt
rename to Windows/Certs/Online/UCA_Global_Root.crt
diff --git a/Windows/Certs/UCA_Root_200101.crt b/Windows/Certs/Online/UCA_Root_200101.crt
similarity index 100%
rename from Windows/Certs/UCA_Root_200101.crt
rename to Windows/Certs/Online/UCA_Root_200101.crt
diff --git a/Windows/Certs/UCA_Root_200401.crt b/Windows/Certs/Online/UCA_Root_200401.crt
similarity index 100%
rename from Windows/Certs/UCA_Root_200401.crt
rename to Windows/Certs/Online/UCA_Root_200401.crt
diff --git a/Windows/Certs/WoSign_Client_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_Client_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_Client_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_Client_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoSign_Premium_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_Premium_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_Premium_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_Premium_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoSign_SGC_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_SGC_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_SGC_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_SGC_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoSign_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoSign_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoSign_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoSign_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_Client_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_Client_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_Client_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_Client_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_Premium_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_Premium_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_Premium_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_Premium_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_SGC_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_SGC_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_SGC_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_SGC_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/WoTrust_Server_Authority_USERTrust.crt b/Windows/Certs/Online/WoTrust_Server_Authority_USERTrust.crt
similarity index 100%
rename from Windows/Certs/WoTrust_Server_Authority_USERTrust.crt
rename to Windows/Certs/Online/WoTrust_Server_Authority_USERTrust.crt
diff --git a/Windows/Certs/[Fake]AnyHotmailCom_201501.crt b/Windows/Certs/Online/[Fake]AnyHotmailCom_201501.crt
similarity index 100%
rename from Windows/Certs/[Fake]AnyHotmailCom_201501.crt
rename to Windows/Certs/Online/[Fake]AnyHotmailCom_201501.crt
diff --git a/Windows/Certs/[Fake]GitHubCom_201301.crt b/Windows/Certs/Online/[Fake]GitHubCom_201301.crt
similarity index 100%
rename from Windows/Certs/[Fake]GitHubCom_201301.crt
rename to Windows/Certs/Online/[Fake]GitHubCom_201301.crt
diff --git a/Windows/Certs/[Fake]GoogleCom_201407.crt b/Windows/Certs/Online/[Fake]GoogleCom_201407.crt
similarity index 100%
rename from Windows/Certs/[Fake]GoogleCom_201407.crt
rename to Windows/Certs/Online/[Fake]GoogleCom_201407.crt
diff --git a/Windows/Certs/[Fake]GoogleCom_201409.crt b/Windows/Certs/Online/[Fake]GoogleCom_201409.crt
similarity index 100%
rename from Windows/Certs/[Fake]GoogleCom_201409.crt
rename to Windows/Certs/Online/[Fake]GoogleCom_201409.crt
diff --git a/Windows/Certs/[Fake]HotmaiCom_201410.crt b/Windows/Certs/Online/[Fake]HotmaiCom_201410.crt
similarity index 100%
rename from Windows/Certs/[Fake]HotmaiCom_201410.crt
rename to Windows/Certs/Online/[Fake]HotmaiCom_201410.crt
diff --git a/Windows/Certs/[Fake]WwwFacebookCom_201410.crt b/Windows/Certs/Online/[Fake]WwwFacebookCom_201410.crt
similarity index 100%
rename from Windows/Certs/[Fake]WwwFacebookCom_201410.crt
rename to Windows/Certs/Online/[Fake]WwwFacebookCom_201410.crt
diff --git a/Windows/Certs/[Fake]WwwIcloudCom_201410.crt b/Windows/Certs/Online/[Fake]WwwIcloudCom_201410.crt
similarity index 100%
rename from Windows/Certs/[Fake]WwwIcloudCom_201410.crt
rename to Windows/Certs/Online/[Fake]WwwIcloudCom_201410.crt
diff --git a/Windows/Certs/[Fake]YahooCom_201409.crt b/Windows/Certs/Online/[Fake]YahooCom_201409.crt
similarity index 100%
rename from Windows/Certs/[Fake]YahooCom_201409.crt
rename to Windows/Certs/Online/[Fake]YahooCom_201409.crt
diff --git a/Windows/Certs/[Suspicious]GoAgent_CA.crt b/Windows/Certs/Online/[Suspicious]GoAgent_CA.crt
similarity index 100%
rename from Windows/Certs/[Suspicious]GoAgent_CA.crt
rename to Windows/Certs/Online/[Suspicious]GoAgent_CA.crt
diff --git a/Windows/Certs/[Suspicious]WaccBaiduCom.crt b/Windows/Certs/Online/[Suspicious]WaccBaiduCom.crt
similarity index 100%
rename from Windows/Certs/[Suspicious]WaccBaiduCom.crt
rename to Windows/Certs/Online/[Suspicious]WaccBaiduCom.crt
diff --git a/Windows/Certs/ePKI_Root_Certification_Authority.crt b/Windows/Certs/Online/ePKI_Root_Certification_Authority.crt
similarity index 100%
rename from Windows/Certs/ePKI_Root_Certification_Authority.crt
rename to Windows/Certs/Online/ePKI_Root_Certification_Authority.crt
diff --git a/Windows/ArchiveCerts/Organization/ABC.crt b/Windows/Certs/Organization/ABC.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ABC.crt
rename to Windows/Certs/Organization/ABC.crt
diff --git a/Windows/ArchiveCerts/Organization/ABC2048.crt b/Windows/Certs/Organization/ABC2048.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ABC2048.crt
rename to Windows/Certs/Organization/ABC2048.crt
diff --git a/Windows/ArchiveCerts/Organization/ABC_TEST_CA.crt b/Windows/Certs/Organization/ABC_TEST_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ABC_TEST_CA.crt
rename to Windows/Certs/Organization/ABC_TEST_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/ALIPAY_ROOT.crt b/Windows/Certs/Organization/ALIPAY_ROOT.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ALIPAY_ROOT.crt
rename to Windows/Certs/Organization/ALIPAY_ROOT.crt
diff --git a/Windows/ArchiveCerts/Organization/AlibabaCom_Corporation_Root_CA.crt b/Windows/Certs/Organization/AlibabaCom_Corporation_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/AlibabaCom_Corporation_Root_CA.crt
rename to Windows/Certs/Organization/AlibabaCom_Corporation_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/Alipay_Trust_NetWork.crt b/Windows/Certs/Organization/Alipay_Trust_NetWork.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Alipay_Trust_NetWork.crt
rename to Windows/Certs/Organization/Alipay_Trust_NetWork.crt
diff --git a/Windows/ArchiveCerts/Organization/BOCOMCA.crt b/Windows/Certs/Organization/BOCOMCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/BOCOMCA.crt
rename to Windows/Certs/Organization/BOCOMCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CCB_CA_ROOT_199906.crt b/Windows/Certs/Organization/CCB_CA_ROOT_199906.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CCB_CA_ROOT_199906.crt
rename to Windows/Certs/Organization/CCB_CA_ROOT_199906.crt
diff --git a/Windows/ArchiveCerts/Organization/CCB_CA_ROOT_200906.crt b/Windows/Certs/Organization/CCB_CA_ROOT_200906.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CCB_CA_ROOT_200906.crt
rename to Windows/Certs/Organization/CCB_CA_ROOT_200906.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA.crt b/Windows/Certs/Organization/CFCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA.crt
rename to Windows/Certs/Organization/CFCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_CA.crt b/Windows/Certs/Organization/CFCA_CS_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_SM2_CA.crt b/Windows/Certs/Organization/CFCA_CS_SM2_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_SM2_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_SM2_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_TEST_CA.crt b/Windows/Certs/Organization/CFCA_CS_TEST_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_TEST_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_TEST_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_CS_TEST_SM2_CA.crt b/Windows/Certs/Organization/CFCA_CS_TEST_SM2_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_CS_TEST_SM2_CA.crt
rename to Windows/Certs/Organization/CFCA_CS_TEST_SM2_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_EV_SM2_ROOT.crt b/Windows/Certs/Organization/CFCA_EV_SM2_ROOT.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_EV_SM2_ROOT.crt
rename to Windows/Certs/Organization/CFCA_EV_SM2_ROOT.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_GT_SM2_CA.crt b/Windows/Certs/Organization/CFCA_GT_SM2_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_GT_SM2_CA.crt
rename to Windows/Certs/Organization/CFCA_GT_SM2_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_Operation_CA3.crt b/Windows/Certs/Organization/CFCA_Operation_CA3.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_Operation_CA3.crt
rename to Windows/Certs/Organization/CFCA_Operation_CA3.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_RCA.crt b/Windows/Certs/Organization/CFCA_RCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_RCA.crt
rename to Windows/Certs/Organization/CFCA_RCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_RSA_RCA.crt b/Windows/Certs/Organization/CFCA_RSA_RCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_RSA_RCA.crt
rename to Windows/Certs/Organization/CFCA_RSA_RCA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_Root_CA.crt b/Windows/Certs/Organization/CFCA_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_Root_CA.crt
rename to Windows/Certs/Organization/CFCA_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/CFCA_SM2_RCA.crt b/Windows/Certs/Organization/CFCA_SM2_RCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/CFCA_SM2_RCA.crt
rename to Windows/Certs/Organization/CFCA_SM2_RCA.crt
diff --git a/Windows/ArchiveCerts/Organization/China_Trust_Network_1.crt b/Windows/Certs/Organization/China_Trust_Network_1.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/China_Trust_Network_1.crt
rename to Windows/Certs/Organization/China_Trust_Network_1.crt
diff --git a/Windows/ArchiveCerts/Organization/China_Trust_Network_2.crt b/Windows/Certs/Organization/China_Trust_Network_2.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/China_Trust_Network_2.crt
rename to Windows/Certs/Organization/China_Trust_Network_2.crt
diff --git a/Windows/ArchiveCerts/Organization/China_Trust_Network_3.crt b/Windows/Certs/Organization/China_Trust_Network_3.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/China_Trust_Network_3.crt
rename to Windows/Certs/Organization/China_Trust_Network_3.crt
diff --git a/Windows/ArchiveCerts/Organization/ICBC.crt b/Windows/Certs/Organization/ICBC.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ICBC.crt
rename to Windows/Certs/Organization/ICBC.crt
diff --git a/Windows/ArchiveCerts/Organization/ICBC_Root_CA.crt b/Windows/Certs/Organization/ICBC_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ICBC_Root_CA.crt
rename to Windows/Certs/Organization/ICBC_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/IcbcCA.crt b/Windows/Certs/Organization/IcbcCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/IcbcCA.crt
rename to Windows/Certs/Organization/IcbcCA.crt
diff --git a/Windows/ArchiveCerts/Organization/Personal_ICBC_CA.crt b/Windows/Certs/Organization/Personal_ICBC_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/Personal_ICBC_CA.crt
rename to Windows/Certs/Organization/Personal_ICBC_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/ROOTCA_NRCAC.crt b/Windows/Certs/Organization/ROOTCA_NRCAC.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ROOTCA_NRCAC.crt
rename to Windows/Certs/Organization/ROOTCA_NRCAC.crt
diff --git a/Windows/ArchiveCerts/Organization/ROOTCA_OSCCA.crt b/Windows/Certs/Organization/ROOTCA_OSCCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/ROOTCA_OSCCA.crt
rename to Windows/Certs/Organization/ROOTCA_OSCCA.crt
diff --git a/Windows/ArchiveCerts/Organization/SZCA.crt b/Windows/Certs/Organization/SZCA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/SZCA.crt
rename to Windows/Certs/Organization/SZCA.crt
diff --git a/Windows/ArchiveCerts/Organization/SZCA_200307.crt b/Windows/Certs/Organization/SZCA_200307.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/SZCA_200307.crt
rename to Windows/Certs/Organization/SZCA_200307.crt
diff --git a/Windows/ArchiveCerts/Organization/TenpayCom_Root_CA.crt b/Windows/Certs/Organization/TenpayCom_Root_CA.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/TenpayCom_Root_CA.crt
rename to Windows/Certs/Organization/TenpayCom_Root_CA.crt
diff --git a/Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_1.crt b/Windows/Certs/Organization/iTruschina_CN_Root_CA_1.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_1.crt
rename to Windows/Certs/Organization/iTruschina_CN_Root_CA_1.crt
diff --git a/Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_2.crt b/Windows/Certs/Organization/iTruschina_CN_Root_CA_2.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_2.crt
rename to Windows/Certs/Organization/iTruschina_CN_Root_CA_2.crt
diff --git a/Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_3.crt b/Windows/Certs/Organization/iTruschina_CN_Root_CA_3.crt
similarity index 100%
rename from Windows/ArchiveCerts/Organization/iTruschina_CN_Root_CA_3.crt
rename to Windows/Certs/Organization/iTruschina_CN_Root_CA_3.crt
diff --git a/Windows/RevokeChinaCerts_Base.bat b/Windows/RevokeChinaCerts_Base.bat
deleted file mode 100644
index 82088c398ccbe3b89c6703dc928ecbd3f0b0fc58..0000000000000000000000000000000000000000
--- a/Windows/RevokeChinaCerts_Base.bat
+++ /dev/null
@@ -1,114 +0,0 @@
-:: RevokeChinaCerts Base batch
-:: Revoke China Certificates.
-:: 
-:: Author: JayXon, Chengr28
-:: 
-
-@echo off
-
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
-
-:: Architecture check
-set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Delete certificates(Base part)
-::  Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
-::  Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
-::  Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
-::  Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
-::  Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
-::  Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
-::  Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
-::  Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
-::  CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
-::  China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
-::  CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
-::  Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
-::  GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
-::  JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
-::  Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
-
-@echo.
-
-:: Add certificates to CRL(Base part)
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GitHubCom_201301.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201407.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]YahooCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]HotmaiCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_SSL_Entrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]WaccBaiduCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\GiantRootCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\JGZXCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Superfish_Inc.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Base version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/RevokeChinaCerts_CodeSigning.bat b/Windows/RevokeChinaCerts_CodeSigning.bat
new file mode 100644
index 0000000000000000000000000000000000000000..ccef18842ee1490eb2e4eb8f85837b0c215bf5c7
--- /dev/null
+++ b/Windows/RevokeChinaCerts_CodeSigning.bat
@@ -0,0 +1,307 @@
+:: RevokeChinaCerts CodeSigning batch
+:: Revoke China Certificates.
+:: 
+:: Author: Chengr28
+:: 
+
+@echo off
+
+
+:: Locate folder, architecture check and choice
+cd /d %~dp0
+set CertMgr="%cd%\Tools\CertMgr"
+if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%cd%\Tools\CertMgr_x86"
+set Folder=%cd%\Certs\CodeSigning
+set /a SetForce = 0
+set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\SoftCertPolicyAppender"
+@echo RevokeChinaCerts CodeSigning batch
+@echo.
+@echo Do you want to set force cetificates policy? [Y/N]
+@echo Setting force need Administrator permissions and Microsoft .NET Framework 4.0!
+set /p UserChoice="Choose: "
+if /i %UserChoice% EQU Y (set /a SetForce=1)
+@echo.
+@echo 1: Revoke CodeSigning cetificates
+@echo 2: Revoke CodeSigning cetificates(Choice version)
+@echo 3: Restore all CodeSigning revoking
+@echo.
+set /p UserChoice="Choose: "
+set UserChoice=CASE_%UserChoice%
+cls
+goto %UserChoice%
+
+
+:: All version
+:CASE_1
+::  WoSign Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+::  WoTrust Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+::  91.Com
+%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
+::  Baidu (China) Co., Ltd.
+%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
+::  Beijing baidu Netcom science and technology co.ltd
+%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
+::  Beijing Baofeng Technology Co., Ltd.
+%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
+::  Beijing Funshion Online Technologies Ltd.
+%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
+::  Beijing Kingsoft Security software Co.,Ltd
+%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
+::  BEIJING KUWO TECHNOLOGY CO.,LTD.
+%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
+::  BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.
+%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
+::  Beijing Rising Information Technology Corporation Limited
+%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
+::  Beijing Sohu New Media Information Technology Co., Ltd.
+%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
+::  Guangzhou Tieren Network Technology Co.,Ltd.
+%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
+::  Kingsoft Security Co.,Ltd
+%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
+::  LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING
+%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
+::  Maxthon (Asia) Limited
+%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
+::  Meitu.Com
+%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
+::  NetEase(Hangzhou) Network Co. Ltd.
+%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
+::  PPLive Corporation
+%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
+::  Qihoo 360 Software Beijing Company Limited
+%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
+::  Shanghai Quan Tudou Network Technology Co., Ltd.
+%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
+::  ShenZhen Xunlei Networking Technologies Ltd.
+%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
+::  TAOBAO (CHINA) SOFTWARE CO.,LTD.
+%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
+::  Tencent Technology Shenzhen Company Limited
+%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
+::  Tencent Technology Shenzhen Company Limited(2010-01-26)
+%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
+::  UC Mobile Limited
+%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
+::  Wandou Technology Ltd
+%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
+::  Xiamen Yitianxia Network Technology Co., Ltd
+%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
+::  Xiami.Com
+%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
+::  Ylmf.Com
+%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
+::  YY Inc
+%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
+:: Set force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\91Com.crt" "%Folder%\Baidu_China_CoLtd.crt" "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" "%Folder%\Kingsoft_Security_CoLtd.crt" "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" "%Folder%\Maxthon_Asia_Limited.crt" "%Folder%\MeituCom.crt" "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" "%Folder%\PPLive_Corporation.crt" "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" "%Folder%\UC_Mobile_Limited.crt" "%Folder%\Wandou_Technology_Ltd.crt" "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" "%Folder%\XiamiCom.crt" "%Folder%\YlmfCom.crt" "%Folder%\YY_Inc.crt")
+goto EXIT
+
+
+:: Choice version
+:CASE_2
+set /p UserChoice="Revoke WoSign Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt"))
+@echo.
+set /p UserChoice="Revoke WoTrust Code Signing Authority(UTN-USERFirst-Object)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt"))
+@echo.
+set /p UserChoice="Revoke 91.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\91Com.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\91Com.crt"))
+@echo.
+set /p UserChoice="Revoke Baidu (China) Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Baidu_China_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Baidu_China_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing baidu Netcom science and technology co.ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Baofeng Technology Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Funshion Online Technologies Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Kingsoft Security software Co.,Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke BEIJING KUWO TECHNOLOGY CO.,LTD.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt"))
+@echo.
+set /p UserChoice="Revoke BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Rising Information Technology Corporation Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Beijing Sohu New Media Information Technology Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Guangzhou Tieren Network Technology Co.,Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Kingsoft Security Co.,Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Kingsoft_Security_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Kingsoft_Security_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt"))
+@echo.
+set /p UserChoice="Revoke Maxthon (Asia) Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Maxthon_Asia_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Maxthon_Asia_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Meitu.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\MeituCom.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\MeituCom.crt"))
+@echo.
+set /p UserChoice="Revoke NetEase(Hangzhou) Network Co. Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke PPLive Corporation? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\PPLive_Corporation.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\PPLive_Corporation.crt"))
+@echo.
+set /p UserChoice="Revoke Qihoo 360 Software Beijing Company Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Shanghai Quan Tudou Network Technology Co., Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke ShenZhen Xunlei Networking Technologies Ltd.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt"))
+@echo.
+set /p UserChoice="Revoke TAOBAO (CHINA) SOFTWARE CO.,LTD.? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt"))
+@echo.
+set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Tencent Technology Shenzhen Company Limited(2010-01-26)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt"))
+@echo.
+set /p UserChoice="Revoke UC Mobile Limited? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\UC_Mobile_Limited.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\UC_Mobile_Limited.crt"))
+@echo.
+set /p UserChoice="Revoke Wandou Technology Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Wandou_Technology_Ltd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Wandou_Technology_Ltd.crt"))
+@echo.
+set /p UserChoice="Revoke Xiamen Yitianxia Network Technology Co., Ltd? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt"))
+@echo.
+set /p UserChoice="Revoke Xiami.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\XiamiCom.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\XiamiCom.crt"))
+@echo.
+set /p UserChoice="Revoke Ylmf.Com? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\YlmfCom.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\YlmfCom.crt"))
+@echo.
+set /p UserChoice="Revoke YY Inc? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\YY_Inc.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\YY_Inc.crt"))
+goto EXIT
+
+
+:: Restore certificates
+:CASE_3
+::  WoSign Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -del -c -sha1 EA36152981E296F9763E1DC74B3262D3928563F8 -s Disallowed
+::  WoTrust Code Signing Authority(UTN-USERFirst-Object)
+%CertMgr% -del -c -sha1 B28CCC46D234A7D7CF7F21CCB9406F48A5273CC6 -s Disallowed
+::  91.Com
+%CertMgr% -del -c -sha1 E87D1C1D3FE2BCA700EB7B8DC0E45B97EAF19405 -s Disallowed
+::  Baidu (China) Co., Ltd.
+%CertMgr% -del -c -sha1 A34B70840C2B6F718877DDB1C2DE2C27F2C91C43 -s Disallowed
+::  Beijing baidu Netcom science and technology co.ltd
+%CertMgr% -del -c -sha1 D60C12D1FDB9E45551A00C8815CCD486C043945B -s Disallowed
+::  Beijing Baofeng Technology Co., Ltd.
+%CertMgr% -del -c -sha1 CB6F65314E5B25D61304AB2C9C8870B574CC21F5 -s Disallowed
+::  Beijing Funshion Online Technologies Ltd.
+%CertMgr% -del -c -sha1 9AB5445104C6CCE5A22431CF29C4331CBC328A1B -s Disallowed
+::  Beijing Kingsoft Security software Co.,Ltd
+%CertMgr% -del -c -sha1 E88DD1ACD2DB3A352072AA49C675F4944A3FEF82 -s Disallowed
+::  BEIJING KUWO TECHNOLOGY CO.,LTD.
+%CertMgr% -del -c -sha1 5FFFD1A3EAE5ED74558913C4A8476D1514C6D61F -s Disallowed
+::  BEIJING QIYI CENTURY SCIENCE&TECHNOLOGY CO.,LTD.
+%CertMgr% -del -c -sha1 5DC57AF121E3101F4BFEA8A22BBDADC0869C80EE -s Disallowed
+::  Beijing Rising Information Technology Corporation Limited
+%CertMgr% -del -c -sha1 D9421BEDD9F5B8A91DD3F8691E7A42D83C983325 -s Disallowed
+::  Beijing Sohu New Media Information Technology Co., Ltd.
+%CertMgr% -del -c -sha1 D1BB252CAC3D250C55978F7EAAF121DA91A17B42 -s Disallowed
+::  Guangzhou Tieren Network Technology Co.,Ltd.
+%CertMgr% -del -c -sha1 2529C0C0D833806AFBFA3C31987C19A18722A2FE -s Disallowed
+::  Kingsoft Security Co.,Ltd
+%CertMgr% -del -c -sha1 2BDEC50B4446652C126709A08248E572B859CCCC -s Disallowed
+::  LE SHI INTERNET INFORMATION TECHNOLOGY CORP.,BEI JING
+%CertMgr% -del -c -sha1 62DF2BC4B5902B52C215C697D06038E3B28CF5D3 -s Disallowed
+::  Maxthon (Asia) Limited
+%CertMgr% -del -c -sha1 1481414E8E87412A00D3341167FE3A92C681B830 -s Disallowed
+::  Meitu.Com
+%CertMgr% -del -c -sha1 7B6FAE77BD19FEC5410293344B36124774A6D8F1 -s Disallowed
+::  NetEase(Hangzhou) Network Co. Ltd.
+%CertMgr% -del -c -sha1 E0387F3AF5752A4620EC617C39153C0E666CF5F8 -s Disallowed
+::  PPLive Corporation
+%CertMgr% -del -c -sha1 5477E38783CD37B1E5729B15D7C0873A2D72DB9D -s Disallowed
+::  Qihoo 360 Software Beijing Company Limited
+%CertMgr% -del -c -sha1 1E5BB77FCB63F26277F95AAE09B852699327A08A -s Disallowed
+::  Shanghai Quan Tudou Network Technology Co., Ltd.
+%CertMgr% -del -c -sha1 935140881F50BDF775D3CEF034C0D21C18FD2567 -s Disallowed
+::  ShenZhen Xunlei Networking Technologies Ltd.
+%CertMgr% -del -c -sha1 4099665730474153EADF671B8B475C03C08A46D0 -s Disallowed
+::  TAOBAO (CHINA) SOFTWARE CO.,LTD.
+%CertMgr% -del -c -sha1 E5777A69CAFD7F7C6F89C5297DD1159C7AE9B881 -s Disallowed
+::  Tencent Technology Shenzhen Company Limited
+%CertMgr% -del -c -sha1 2FDD445591CD2EEDBEF8B8A281896A59C08B3DC9 -s Disallowed
+::  Tencent Technology Shenzhen Company Limited(2010-01-26)
+%CertMgr% -del -c -sha1 8B46390D86B891E5A3D3AAB2B00D6FDB27A0F791 -s Disallowed
+::  UC Mobile Limited
+%CertMgr% -del -c -sha1 1540C77B5D19FC5A71A04DB001488E55B45DDC7F -s Disallowed
+::  Wandou Technology Ltd
+%CertMgr% -del -c -sha1 AB09D1AFE555CFC580575F5BC78B16B9F1C4E432 -s Disallowed
+::  Xiamen Yitianxia Network Technology Co., Ltd
+%CertMgr% -del -c -sha1 F49A648C69C2F01A0FDEB3992C5AE0A14D5AD9FC -s Disallowed
+::  Xiami.Com
+%CertMgr% -del -c -sha1 EEC507F719D5BA0CB913F034E045A24A509D8A5F -s Disallowed
+::  Ylmf.Com
+%CertMgr% -del -c -sha1 93A77CA50F165A5873DD3995874867B616AB3644 -s Disallowed
+::  YY Inc
+%CertMgr% -del -c -sha1 B3B89CD7940DC67E4291A3EE767AC17A3BC9E620 -s Disallowed
+:: Unset force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% -r --unset-force "%Folder%\WoSign_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\WoTrust_Code_Signing_Authority_UTN_USERFirst_Object.crt" "%Folder%\91Com.crt" "%Folder%\Baidu_China_CoLtd.crt" "%Folder%\Beijing_Baidu_Netcom_Science_And_Technology_CoLtd.crt" "%Folder%\Beijing_Baofeng_Technology_CoLtd.crt" "%Folder%\Beijing_Funshion_Online_Technologies_Ltd.crt" "%Folder%\Beijing_Kingsoft_Security_Software_CoLtd.crt" "%Folder%\BEIJING_KUWO_TECHNOLOGY_COLTD.crt" "%Folder%\BEIJING_QIYI_CENTURY_SCIENCE_TECHNOLOGY_COLTD.crt" "%Folder%\Beijing_Rising_Information_Technology_Corporation_Limited.crt" "%Folder%\Beijing_Sohu_New_Media_Information_Technology_CoLtd.crt" "%Folder%\Guangzhou_Tieren_Network_Technology_CoLtd.crt" "%Folder%\Kingsoft_Security_CoLtd.crt" "%Folder%\LE_SHI_INTERNET_INFORMATION_TECHNOLOGY_CORP_BEIJING.crt" "%Folder%\Maxthon_Asia_Limited.crt" "%Folder%\MeituCom.crt" "%Folder%\NetEase_Hangzhou_Network_CoLtd.crt" "%Folder%\PPLive_Corporation.crt" "%Folder%\Qihoo_360_Software_Beijing_Company_Limited.crt" "%Folder%\Shanghai_Quan_Tudou_Network_Technology_CoLtd.crt" "%Folder%\ShenZhen_Xunlei_Networking_Technologies_Ltd.crt" "%Folder%\TAOBAO_CHINA_SOFTWARE_COLTD.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited.crt" "%Folder%\Tencent_Technology_Shenzhen_Company_Limited_201001.crt" "%Folder%\UC_Mobile_Limited.crt" "%Folder%\Wandou_Technology_Ltd.crt" "%Folder%\Xiamen_Yitianxia_Network_Technology_CoLtd.crt" "%Folder%\XiamiCom.crt" "%Folder%\YlmfCom.crt" "%Folder%\YY_Inc.crt")
+
+
+:: Print to screen.
+:EXIT
+@echo.
+@echo RevokeChinaCerts CodeSigning batch
+@echo Done, please confirm the messages on screen.
+@echo.
+@pause
diff --git a/Windows/RevokeChinaCerts_Extended.bat b/Windows/RevokeChinaCerts_Extended.bat
deleted file mode 100644
index fcbd832eb97b8388bf88126f9b9ebd750e8a7771..0000000000000000000000000000000000000000
--- a/Windows/RevokeChinaCerts_Extended.bat
+++ /dev/null
@@ -1,179 +0,0 @@
-:: RevokeChinaCerts Extended batch
-:: Revoke China Certificates.
-:: 
-:: Author: JayXon, Chengr28
-:: 
-
-@echo off
-
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
-
-:: Architecture check
-set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Delete certificates(Base part)
-::  Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
-::  Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
-::  Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
-::  Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
-::  Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
-::  Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
-::  Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
-::  Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
-::  CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
-::  China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
-::  CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
-::  Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
-::  GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
-::  JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
-::  Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
-
-:: Delete certificates(Extended part)
-::  CFCA GT CA(2011-06-13)
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser AuthRoot
-::  CFCA GT CA(2012-08-21) [YFdyh000]
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser AuthRoot
-::  CFCA EV ROOT
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser AuthRoot
-::  UCA Global Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser AuthRoot
-::  UCA Root(2004-01-01)
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser AuthRoot
-::  UCA Extended Validation Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser AuthRoot
-::  UCA ROOT(2001-01-01)
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser AuthRoot
-::  GoAgent CA [lenovo-me]
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser AuthRoot
-::  SZCA [yfdyh000]
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser AuthRoot
-::  SZCA(2003-07-22) [yfdyh000]
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser AuthRoot
-
-@echo.
-
-:: Add certificates to CRL(Base part)
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GitHubCom_201301.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201407.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]YahooCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]HotmaiCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_SSL_Entrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]WaccBaiduCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\GiantRootCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\JGZXCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Superfish_Inc.crt" -s Disallowed
-
-:: Add certificates to CRL(Extended part)
-::%CertMgr% -add -c ROOTCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201106.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201208.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_EV_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Global_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Root_200401.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Extended_Validation_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_ROOT_200101.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]GoAgent_CA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA_200307.crt" -s Disallowed
-
-:: Print to screen.
-@echo.
-@echo RevokeChinaCerts Extended version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/RevokeChinaCerts_All.bat b/Windows/RevokeChinaCerts_Online.bat
similarity index 62%
rename from Windows/RevokeChinaCerts_All.bat
rename to Windows/RevokeChinaCerts_Online.bat
index 0f4bc03e2d501bc9ccf22b1ac20ecb1c12b92d54..de5d442320e84146a26323ee9bb1ef687a005417 100644
--- a/Windows/RevokeChinaCerts_All.bat
+++ b/Windows/RevokeChinaCerts_Online.bat
@@ -1,4 +1,4 @@
-:: RevokeChinaCerts All batch
+:: RevokeChinaCerts Online batch
 :: Revoke China Certificates.
 :: 
 :: Author: JayXon, Chengr28
@@ -6,145 +6,28 @@
 
 @echo off
 
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
 
-:: Architecture check
+:: Locate folder, architecture check, choice and update certificates
+cd /d %~dp0
 set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Delete certificates(Base part)
-::  Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
-::  Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
-::  Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
-::  Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
-::  Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
-::  Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
-::  Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
-::  Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
-::  CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
-::  China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
-::  CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
-::  Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
-::  GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
-::  JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
-::  Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
+if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%~dp0\Tools\CertMgr_x86"
+set Folder=%cd%\Certs\Online
+@echo RevokeChinaCerts Online batch
+@echo.
+@echo 1: Base version
+@echo 2: Extended version
+@echo 3: All version
+@echo 4: Restore all Online revoking
+@echo.
+set /p UserChoice="Choose: "
+if %UserChoice% GTR 0 (if %UserChoice% LEQ 4 ("%~dp0\Tools\RootSUPD_201403_x86"))
+set UserChoice=CASE_%UserChoice%
+cls
+goto %UserChoice%
 
-:: Delete certificates(Extended part)
-::  CFCA GT CA(2011-06-13)
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser AuthRoot
-::  CFCA GT CA(2012-08-21) [YFdyh000]
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser AuthRoot
-::  CFCA EV ROOT
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser AuthRoot
-::  UCA Global Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser AuthRoot
-::  UCA Root(2004-01-01)
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser AuthRoot
-::  UCA Extended Validation Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser AuthRoot
-::  UCA ROOT(2001-01-01)
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser AuthRoot
-::  GoAgent CA [lenovo-me]
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine AuthRoot
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser Root
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser AuthRoot
-::  SZCA [yfdyh000]
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s -r CurrentUser AuthRoot
-::  SZCA(2003-07-22) [yfdyh000]
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s -r CurrentUser AuthRoot
 
 :: Delete certificates(All part)
-::  ROOTCA OSCCA
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine Root
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s -r CurrentUser AuthRoot
+:CASE_3
 ::  SRCA
 %CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine Root
 %CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s -r localMachine AuthRoot
@@ -209,21 +92,6 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp
 ::  WoTrust Client Authority(USERTrust)
 %CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s -r localMachine CA
 %CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s -r CurrentUser CA
-::  China Trust Network(1) [QuantumGhost]
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine Root
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s -r CurrentUser AuthRoot
-::  China Trust Network(2) [QuantumGhost]
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine Root
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s -r CurrentUser AuthRoot
-::  China Trust Network(3) [QuantumGhost]
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine Root
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r localMachine AuthRoot
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r CurrentUser Root
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s -r CurrentUser AuthRoot
 ::  Hongkong Post Root CA
 %CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s -r localMachine Root
 %CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s -r localMachine AuthRoot
@@ -278,78 +146,303 @@ if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp
 ::  TWCA Secure Certification Authority
 %CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s -r localMachine CA
 %CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s -r CurrentUser CA
+:: Add certificates to CRL(All part)
+%CertMgr% -add -c "%Folder%\SRCA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_Chinese.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Class_1_Primary_CA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_200908.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_StartCom_201103_1.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_StartCom_201103_2.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_StartCom_200609.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_Chinese_StartCom.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Certification_Authority_Of_WoSign_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_Premium_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_SGC_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoSign_Client_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_Premium_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_SGC_Server_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\WoTrust_Client_Authority_USERTrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Hongkong_Post_Root_CA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Hongkong_Post_Root_CA_1.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Macao_Post_eSignTrust_Root_Certification_Authority.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\ePKI_Root_Certification_Authority.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Government_Root_Certification_Authority.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Global_Root_CA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Root_Certification_Authority_1.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Root_Certification_Authority_2.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TaiCA_Secure_CA_GTE.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Secure_CA_Baltimore.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\TWCA_Secure_Certification_Authority_USERTrust.crt" -s Disallowed
+
+
+:: Delete certificates(Extended part)
+:CASE_2
+::  CFCA GT CA(2011-06-13)
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine Root
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s -r CurrentUser AuthRoot
+::  CFCA GT CA(2012-08-21) [YFdyh000]
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine Root
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s -r CurrentUser AuthRoot
+::  CFCA EV ROOT
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine Root
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s -r CurrentUser AuthRoot
+::  UCA Global Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s -r CurrentUser AuthRoot
+::  UCA Root(2004-01-01)
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine Root
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s -r CurrentUser AuthRoot
+::  UCA Extended Validation Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s -r CurrentUser AuthRoot
+::  UCA ROOT(2001-01-01)
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine Root
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s -r CurrentUser AuthRoot
+::  GoAgent CA [lenovo-me]
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine Root
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s -r CurrentUser AuthRoot
+:: Add certificates to CRL(Extended part)
+%CertMgr% -add -c "%Folder%\CFCA_GT_CA_201106.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CFCA_GT_CA_201208.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CFCA_EV_ROOT.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_Global_Root.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_Root_200401.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_Extended_Validation_Root.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\UCA_ROOT_200101.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Suspicious]GoAgent_CA.crt" -s Disallowed
 
-@echo.
 
+:: Delete certificates(Base part)
+:CASE_1
+::  Fake github.com(2013-01-25)
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine Root
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s -r CurrentUser AuthRoot
+::  Fake google.com(2014-07-24)
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine Root
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s -r CurrentUser AuthRoot
+::  Fake google.com(2014-09-18) [YFdyh000]
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine Root
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s -r CurrentUser AuthRoot
+::  Fake yahoo.com(2014-09-30)
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine Root
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s -r CurrentUser AuthRoot
+::  Fake hotmai.com(2014-10-02)
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine Root
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s -r CurrentUser AuthRoot
+::  Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine Root
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s -r CurrentUser AuthRoot
+::  Fake www.icound.com(2014-10-04) [YFdyh000]
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine Root
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s -r CurrentUser AuthRoot
+::  Fake *.hotmail.com(2015-01-17) [YFdyh000]
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine Root
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s -r CurrentUser AuthRoot
+::  CNNIC ROOT
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine Root
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s -r CurrentUser AuthRoot
+::  China Internet Network Information Center EV Certificates Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s -r CurrentUser AuthRoot
+::  CNNIC SSL(Entrust)
+%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r localMachine CA
+%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s -r CurrentUser CA
+::  Baidu WACC service [SCFWSE]
+%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r localMachine CA
+%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s -r CurrentUser CA
+::  GiantRootCA
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine Root
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s -r CurrentUser AuthRoot
+::  JGZXCA
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine Root
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s -r CurrentUser AuthRoot
+::  Superfish, Inc. [Septembers/v998]
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine Root
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r localMachine AuthRoot
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser Root
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s -r CurrentUser AuthRoot
 :: Add certificates to CRL(Base part)
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GitHubCom_201301.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201407.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]GoogleCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]YahooCom_201409.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]HotmaiCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CNNIC_SSL_Entrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]WaccBaiduCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\GiantRootCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\JGZXCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Superfish_Inc.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]GitHubCom_201301.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]GoogleCom_201407.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]GoogleCom_201409.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]YahooCom_201409.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]HotmaiCom_201410.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]WwwFacebookCom_201410.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]WwwIcloudCom_201410.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Fake]AnyHotmailCom_201501.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CNNIC_ROOT.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\China_Internet_Network_Information_Center_EV_Certificates_Root.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\CNNIC_SSL_Entrust.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\[Suspicious]WaccBaiduCom.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\GiantRootCA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\JGZXCA.crt" -s Disallowed
+%CertMgr% -add -c "%Folder%\Superfish_Inc.crt" -s Disallowed
+goto EXIT
 
-:: Add certificates to CRL(Extended part)
-::%CertMgr% -add -c ROOTCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201106.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_GT_CA_201208.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\CFCA_EV_ROOT.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Global_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Root_200401.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_Extended_Validation_Root.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\UCA_ROOT_200101.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\[Suspicious]GoAgent_CA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\SZCA_200307.crt" -s Disallowed
 
-:: Add certificates to CRL(All part)
-::%CertMgr% -add -c "%~dp0\Certs\ROOTCA_OSCCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\SRCA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_Chinese.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Class_1_Primary_CA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_200908.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_StartCom_201103_1.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_StartCom_201103_2.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_StartCom_200609.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_Chinese_StartCom.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Certification_Authority_Of_WoSign_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_Premium_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_SGC_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoSign_Client_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_Premium_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_SGC_Server_Authority_USERTrust.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\WoTrust_Client_Authority_USERTrust.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\China_Trust_Network_1.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\China_Trust_Network_2.crt" -s Disallowed
-::%CertMgr% -add -c "%~dp0\Certs\China_Trust_Network_3.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Hongkong_Post_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Hongkong_Post_Root_CA_1.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Macao_Post_eSignTrust_Root_Certification_Authority.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\ePKI_Root_Certification_Authority.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\Government_Root_Certification_Authority.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Global_Root_CA.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Root_Certification_Authority_1.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Root_Certification_Authority_2.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TaiCA_Secure_CA_GTE.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Secure_CA_Baltimore.crt" -s Disallowed
-%CertMgr% -add -c "%~dp0\Certs\TWCA_Secure_Certification_Authority_USERTrust.crt" -s Disallowed
+:: Restore certificates
+:CASE_4
+:: Base part
+::  Fake github.com(2013-01-25)
+%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s Disallowed
+::  Fake google.com(2014-07-24)
+%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s Disallowed
+::  Fake google.com(2014-09-18) [YFdyh000]
+%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s Disallowed
+::  Fake yahoo.com(2014-09-30)
+%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s Disallowed
+::  Fake hotmai.com(2014-10-02)
+%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s Disallowed
+::  Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
+%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s Disallowed
+::  Fake www.icound.com(2014-10-04) [YFdyh000]
+%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s Disallowed
+::  Fake *.hotmail.com(2015-01-17) [YFdyh000]
+%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s Disallowed
+::  CNNIC ROOT
+%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s Disallowed
+::  China Internet Network Information Center EV Certificates Root
+%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s Disallowed
+::  CNNIC SSL(Entrust)
+%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s Disallowed
+::  Baidu WACC service [SCFWSE]
+%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s Disallowed
+::  GiantRootCA
+%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s Disallowed
+::  JGZXCA
+%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s Disallowed
+::  Superfish, Inc. [Septembers/v998]
+%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s Disallowed
+
+:: Extended part
+::  CFCA GT CA(2011-06-13)
+%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s Disallowed
+::  CFCA GT CA(2012-08-21) [YFdyh000]
+%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s Disallowed
+::  CFCA EV ROOT
+%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s Disallowed
+::  UCA Global Root
+%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s Disallowed
+::  UCA Root(2004-01-01)
+%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s Disallowed
+::  UCA Extended Validation Root
+%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s Disallowed
+::  UCA ROOT(2001-01-01)
+%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s Disallowed
+::  GoAgent CA [lenovo-me]
+%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s Disallowed
+
+:: All part
+::  SRCA
+%CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s Disallowed
+::  Certification Authority of WoSign
+%CertMgr% -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s Disallowed
+::  Certification Authority of WoSign(Chinese)
+%CertMgr% -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s Disallowed
+::  Class 1 Primary CA
+%CertMgr% -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s Disallowed
+::  Certification Authority of WoSign(2009-08-08)
+%CertMgr% -del -c -sha1 33A4D8BC38608EF52EF0E28A35091E9250907FB9 -s Disallowed
+::  Certification Authority of WoSign 1(StartCom/2011-03-01)
+%CertMgr% -del -c -sha1 868241C8B85AF79E2DAC79EDADB723E82A36AFC3 -s Disallowed
+::  Certification Authority of WoSign 2(StartCom/2011-03-01)
+%CertMgr% -del -c -sha1 692790DA5189529CC5CE1E16E984277A03023E99 -s Disallowed
+::  Certification Authority of WoSign(StartCom/2006-09-18)
+%CertMgr% -del -c -sha1 804E5FB7DE84F5F5B28347233EAF07846B6070D3 -s Disallowed
+::  Certification Authority of WoSign(Chinese/StartCom) [v998]
+%CertMgr% -del -c -sha1 D8EFF6C28BB508E4702565F42748454A872BD412 -s Disallowed
+::  Certification Authority of WoSign(USERTrust) [v998]
+%CertMgr% -del -c -sha1 56FAADDC596DCF78D585D83A35BC04B690D12736 -s Disallowed
+::  WoSign Premium Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 E3D569137E603E7BACB6BCC66AE943850C8ADF38 -s Disallowed
+::  WoSign Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 3E14B8BD6C568657D852D95D387249AE857B4A39 -s Disallowed
+::  WoSign SGC Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 6D5A18050D56BFDE525CBE89E8C45DD1B53D12E9 -s Disallowed
+::  WoSign Client Authority(USERTrust)
+%CertMgr% -del -c -sha1 FAD4319D4E173FF3853E51C98D21919BF3DA1A1E -s Disallowed
+::  WoTrust Premium Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 381CBC5048AFD9A02D3E5882D5F22D962B1A5F72 -s Disallowed
+::  WoTrust Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 337DF96418F08A9355870513AFCEBDC68BCED767 -s Disallowed
+::  WoTrust SGC Server Authority(USERTrust)
+%CertMgr% -del -c -sha1 46A762F3C3CF3732DE22A8BA1EBBA3BC048F9B8C -s Disallowed
+::  WoTrust Client Authority(USERTrust)
+%CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s Disallowed
+::  Hongkong Post Root CA
+%CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s Disallowed
+::  Hongkong Post Root CA 1 [v998]
+%CertMgr% -del -c -sha1 D6DAA8208D09D2154D24B52FCB346EB258B28A58 -s Disallowed
+::  Macao Post eSignTrust Root Certification Authority
+%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s Disallowed
+::  Macao Post eSignTrust Root Certification Authority(G02)
+%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s Disallowed
+::  ePKI Root Certification Authority
+%CertMgr% -del -c -sha1 67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0 -s Disallowed
+::  Government Root Certification Authority
+%CertMgr% -del -c -sha1 F48B11BFDEABBE94542071E641DE6BBE882B40B9 -s Disallowed
+::  TWCA Global Root CA
+%CertMgr% -del -c -sha1 9CBB4853F6A4F6D352A4E83252556013F5ADAF65 -s Disallowed
+::  TWCA Root Certification Authority(1)
+%CertMgr% -del -c -sha1 CF9E876DD3EBFC422697A3B5A37AA076A9062348 -s Disallowed
+::  TWCA Root Certification Authority(2)
+%CertMgr% -del -c -sha1 DF646DCB7B0FD3A96AEE88C64E2D676711FF9D5F -s Disallowed
+::  TaiCA Secure CA
+%CertMgr% -del -c -sha1 5B404B6DB43E1F71557F75552E7668289B1B6309 -s Disallowed
+::  TWCA Secure CA
+%CertMgr% -del -c -sha1 3F3E6C4B33802A2FEA46C5CACA14770A40018899 -s Disallowed
+::  TWCA Secure Certification Authority
+%CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s Disallowed
+
 
 :: Print to screen.
+:EXIT
 @echo.
-@echo RevokeChinaCerts All version
-@echo Done. Please confirm the messages on screen.
+@echo RevokeChinaCerts Online batch
+@echo Done, please confirm the messages on screen.
 @echo.
 @pause
diff --git a/Windows/RevokeChinaCerts_Organization.bat b/Windows/RevokeChinaCerts_Organization.bat
new file mode 100644
index 0000000000000000000000000000000000000000..82f9959ee3a451feaa7a3ac98556e0c3d14cb5d3
--- /dev/null
+++ b/Windows/RevokeChinaCerts_Organization.bat
@@ -0,0 +1,298 @@
+:: RevokeChinaCerts Organization batch
+:: Revoke China Certificates.
+:: 
+:: Author: Chengr28
+:: 
+
+@echo off
+
+
+:: Locate folder, architecture check and choice
+cd /d %~dp0
+set CertMgr="%cd%\Tools\CertMgr"
+if %PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432% EQU x86 set CertMgr="%cd%\Tools\CertMgr_x86"
+set Folder=%cd%\Certs\Organization
+set /a SetForce = 0
+set SetForceAppender="%cd%\Tools\SoftCertPolicyAppender\SoftCertPolicyAppender"
+@echo RevokeChinaCerts Organization batch
+@echo.
+@echo Do you want to set force cetificates policy? [Y/N]
+@echo Setting force need Administrator permissions and Microsoft .NET Framework 4.0!
+set /p UserChoice="Choose: "
+if /i %UserChoice% EQU Y (set /a SetForce=1)
+@echo.
+@echo 1: Revoke Organization cetificates
+@echo 2: Revoke Organization cetificates(Choice version)
+@echo 3: Restore all Organization revoking
+@echo.
+set /p UserChoice="Choose: "
+set UserChoice=CASE_%UserChoice%
+cls
+goto %UserChoice%
+
+
+:: All version
+:CASE_1
+::  ABC
+%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
+::  ABC TEST CA
+%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
+::  ABC2048
+%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
+::  Alibaba.com Corporation Root CA
+%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
+::  ALIPAY_ROOT
+%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
+::  Alipay Trust NetWork
+%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
+::  BOCOMCA
+%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
+::  CCB CA ROOT(1999-06-29)
+%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
+::  CCB CA ROOT(2009-06-01)
+%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
+::  CFCA
+%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
+::  CFCA CS CA
+%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
+::  CFCA CS TEST CA
+%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
+::  CFCA Operation CA3
+%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
+::  CFCA RCA
+%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
+::  CFCA Root CA
+%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
+::  CFCA RSA RCA
+%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
+::  China Trust Network(1)
+%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
+::  China Trust Network(2)
+%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
+::  China Trust Network(3)
+%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
+::  ICBC
+%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
+::  ICBC Root CA
+%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
+::  IcbcCA
+%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
+::  iTruschina CN Root CA(1)
+%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
+::  iTruschina CN Root CA(2)
+%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
+::  iTruschina CN Root CA(3)
+%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
+::  Personal ICBC CA
+%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
+::  ROOTCA OSCCA
+%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
+::  SZCA
+%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
+::  SZCA(20030722)
+%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
+::  TenpayCom Root CA
+%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
+:: Set force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ABC.crt" "%Folder%\ABC_TEST_CA.crt" "%Folder%\ABC2048.crt" "%Folder%\AlibabaCom_Corporation_Root_CA.crt" "%Folder%\ALIPAY_ROOT.crt" "%Folder%\Alipay_Trust_NetWork.crt" "%Folder%\BOCOMCA.crt" "%Folder%\CCB_CA_ROOT_199906.crt" "%Folder%\CCB_CA_ROOT_200906.crt" "%Folder%\CFCA.crt" "%Folder%\CFCA_CS_CA.crt" "%Folder%\CFCA_CS_TEST_CA.crt" "%Folder%\CFCA_Operation_CA3.crt" "%Folder%\CFCA_RCA.crt" "%Folder%\CFCA_Root_CA.crt" "%Folder%\CFCA_RSA_RCA.crt" "%Folder%\China_Trust_Network_1.crt" "%Folder%\China_Trust_Network_2.crt" "%Folder%\China_Trust_Network_3.crt" "%Folder%\ICBC.crt" "%Folder%\ICBC_Root_CA.crt" "%Folder%\IcbcCA.crt" "%Folder%\iTruschina_CN_Root_CA_1.crt" "%Folder%\iTruschina_CN_Root_CA_2.crt" "%Folder%\iTruschina_CN_Root_CA_3.crt" "%Folder%\Personal_ICBC_CA.crt" "%Folder%\ROOTCA_OSCCA.crt" "%Folder%\SZCA.crt" "%Folder%\SZCA_200307.crt" "%Folder%\TenpayCom_Root_CA.crt")
+goto EXIT
+
+
+:: Choice version
+:CASE_2
+set /p UserChoice="Revoke ABC? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ABC.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ABC.crt"))
+@echo.
+set /p UserChoice="Revoke ABC TEST CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ABC_TEST_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force %Folder%\ABC_TEST_CA.crt""))
+@echo.
+set /p UserChoice="Revoke ABC2048? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ABC2048.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force %Folder%\ABC2048.crt""))
+@echo.
+set /p UserChoice="Revoke Alibaba.com Corporation Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\AlibabaCom_Corporation_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\AlibabaCom_Corporation_Root_CA.crt"))
+@echo.
+set /p UserChoice="Revoke ALIPAY_ROOT? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ALIPAY_ROOT.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ALIPAY_ROOT.crt"))
+@echo.
+set /p UserChoice="Revoke Alipay Trust NetWork? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Alipay_Trust_NetWork.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Alipay_Trust_NetWork.crt"))
+@echo.
+set /p UserChoice="Revoke BOCOMCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\BOCOMCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\BOCOMCA.crt"))
+@echo.
+set /p UserChoice="Revoke CCB CA ROOT(1999-06-29)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_199906.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CCB_CA_ROOT_199906.crt"))
+@echo.
+set /p UserChoice="Revoke CCB CA ROOT(2009-06-01)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CCB_CA_ROOT_200906.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CCB_CA_ROOT_200906.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA CS CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_CS_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_CS_CA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA CS TEST CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_CS_TEST_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_CS_TEST_CA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA Operation CA3? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_Operation_CA3.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_Operation_CA3.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA RCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_RCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_RCA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_Root_CA.crt"))
+@echo.
+set /p UserChoice="Revoke CFCA RSA RCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\CFCA_RSA_RCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\CFCA_RSA_RCA.crt"))
+@echo.
+set /p UserChoice="Revoke China Trust Network(1)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\China_Trust_Network_1.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\China_Trust_Network_1.crt"))
+@echo.
+set /p UserChoice="Revoke China Trust Network(2)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\China_Trust_Network_2.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\China_Trust_Network_2.crt"))
+@echo.
+set /p UserChoice="Revoke China Trust Network(3)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\China_Trust_Network_3.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\China_Trust_Network_3.crt"))
+@echo.
+set /p UserChoice="Revoke ICBC? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ICBC.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ICBC.crt"))
+@echo.
+set /p UserChoice="Revoke ICBC Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ICBC_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ICBC_Root_CA.crt"))
+@echo.
+set /p UserChoice="Revoke IcbcCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\IcbcCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\IcbcCA.crt"))
+@echo.
+set /p UserChoice="Revoke iTruschina CN Root CA(1)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_1.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\iTruschina_CN_Root_CA_1.crt"))
+@echo.
+set /p UserChoice="Revoke iTruschina CN Root CA(2)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_2.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\iTruschina_CN_Root_CA_2.crt"))
+@echo.
+set /p UserChoice="Revoke iTruschina CN Root CA(3)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\iTruschina_CN_Root_CA_3.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\iTruschina_CN_Root_CA_3.crt"))
+@echo.
+set /p UserChoice="Revoke Personal ICBC CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\Personal_ICBC_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\Personal_ICBC_CA.crt"))
+@echo.
+set /p UserChoice="Revoke ROOTCA OSCCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\ROOTCA_OSCCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\ROOTCA_OSCCA.crt"))
+@echo.
+set /p UserChoice="Revoke SZCA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\SZCA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\SZCA.crt"))
+@echo.
+set /p UserChoice="Revoke SZCA(20030722)? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\SZCA_200307.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\SZCA_200307.crt"))
+@echo.
+set /p UserChoice="Revoke TenpayCom Root CA? [Y/N]"
+if /i %UserChoice% EQU Y (%CertMgr% -add -c "%Folder%\TenpayCom_Root_CA.crt" -s Disallowed
+if %SetForce% EQU 1 (%SetForceAppender% --set-force "%Folder%\TenpayCom_Root_CA.crt"))
+goto EXIT
+
+
+:: Restore certificates
+::  ABC
+%CertMgr% -del -c -sha1 78D0CDF5752D1E5B58A674644CFE3499BF02F9EF -s Disallowed
+::  ABC TEST CA
+%CertMgr% -del -c -sha1 F18C39F8B5A3E9BADC811BBA7690E8D0143BD851 -s Disallowed
+::  ABC2048
+%CertMgr% -del -c -sha1 6FAE9AD81467C5FCB93574670F52C8EF538F8B6D -s Disallowed
+::  Alibaba.com Corporation Root CA
+%CertMgr% -del -c -sha1 A7217F919843199C958C128449DD52D2723B0A8A -s Disallowed
+::  ALIPAY_ROOT
+%CertMgr% -del -c -sha1 59864294A96B3E5C37C058E9D1FBDE5FF0C2E4EE -s Disallowed
+::  Alipay Trust NetWork
+%CertMgr% -del -c -sha1 89A2FB0E332BA7275FE712FEC669D746125B1F32 -s Disallowed
+::  BOCOMCA
+%CertMgr% -del -c -sha1 4571466B830EAC5FCDC22103B9733C1A15CE78AC -s Disallowed
+::  CCB CA ROOT(1999-06-29)
+%CertMgr% -del -c -sha1 3018E5D74DF29E3590F5BB8DF01AA7FC116BB4DE -s Disallowed
+::  CCB CA ROOT(2009-06-01)
+%CertMgr% -del -c -sha1 8582B4AF7491B3D16636EEB32D44993D7DEE6C40 -s Disallowed
+::  CFCA
+%CertMgr% -del -c -sha1 A9743B713E4109381622D3689AB5D9E1DC51B164 -s Disallowed
+::  CFCA CS CA
+%CertMgr% -del -c -sha1 D3FBFAA8A67FC9A2EADBF86AEB5D07A9D6AF322E -s Disallowed
+::  CFCA CS TEST CA
+%CertMgr% -del -c -sha1 B5DCF1C58E86DBED2EA2D217A5C28D11FD9254F0 -s Disallowed
+::  CFCA Operation CA3
+%CertMgr% -del -c -sha1 5A3A3EA74AE5D29F25A670024949869D1222E42A -s Disallowed
+::  CFCA RCA
+%CertMgr% -del -c -sha1 AE73DFF81CF24E50DD52CA1496E7EF94876061CB -s Disallowed
+::  CFCA Root CA
+%CertMgr% -del -c -sha1 31BD6AEF73031C5A49338E7A06040DD815EF7512 -s Disallowed
+::  CFCA RSA RCA
+%CertMgr% -del -c -sha1 57C5CEBB53FBF181E0B13977AF864F1C13F11AA9 -s Disallowed
+::  China Trust Network(1)
+%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s Disallowed
+::  China Trust Network(2)
+%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s Disallowed
+::  China Trust Network(3)
+%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s Disallowed
+::  ICBC
+%CertMgr% -del -c -sha1 E3F9043072BABF5E9C631960B34CCCF9FFC8BA41 -s Disallowed
+::  ICBC Root CA
+%CertMgr% -del -c -sha1 5A960203C10CFA8D42DD115B61154F98E2F617F7 -s Disallowed
+::  IcbcCA
+%CertMgr% -del -c -sha1 A02A23D13576ECA35498DC69166A20651E203E31 -s Disallowed
+::  iTruschina CN Root CA(1)
+%CertMgr% -del -c -sha1 240A61A2577970625B9F0B81283C4AA4037217B1 -s Disallowed
+::  iTruschina CN Root CA(2)
+%CertMgr% -del -c -sha1 46F168AF009C28C18F452EB85F5E8747892B3C8B -s Disallowed
+::  iTruschina CN Root CA(3)
+%CertMgr% -del -c -sha1 654E9FADD2032AE1B87D6263AF04FD7FEE38D57C -s Disallowed
+::  Personal ICBC CA
+%CertMgr% -del -c -sha1 2ABC81B0D7D052F887965562BB10AA66A80F7674 -s Disallowed
+::  ROOTCA OSCCA
+%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
+::  SZCA
+%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s Disallowed
+::  SZCA(20030722)
+%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s Disallowed
+::  TenpayCom Root CA
+%CertMgr% -del -c -sha1 56502166C0DE2488950491C90C7560E0E7AA7378 -s Disallowed
+:: Unset force
+@echo.
+if %SetForce% EQU 1 (%SetForceAppender% -r --unset-force "%Folder%\ABC.crt" "%Folder%\ABC_TEST_CA.crt" "%Folder%\ABC2048.crt" "%Folder%\AlibabaCom_Corporation_Root_CA.crt" "%Folder%\ALIPAY_ROOT.crt" "%Folder%\Alipay_Trust_NetWork.crt" "%Folder%\BOCOMCA.crt" "%Folder%\CCB_CA_ROOT_199906.crt" "%Folder%\CCB_CA_ROOT_200906.crt" "%Folder%\CFCA.crt" "%Folder%\CFCA_CS_CA.crt" "%Folder%\CFCA_CS_TEST_CA.crt" "%Folder%\CFCA_Operation_CA3.crt" "%Folder%\CFCA_RCA.crt" "%Folder%\CFCA_Root_CA.crt" "%Folder%\CFCA_RSA_RCA.crt" "%Folder%\China_Trust_Network_1.crt" "%Folder%\China_Trust_Network_2.crt" "%Folder%\China_Trust_Network_3.crt" "%Folder%\ICBC.crt" "%Folder%\ICBC_Root_CA.crt" "%Folder%\IcbcCA.crt" "%Folder%\iTruschina_CN_Root_CA_1.crt" "%Folder%\iTruschina_CN_Root_CA_2.crt" "%Folder%\iTruschina_CN_Root_CA_3.crt" "%Folder%\Personal_ICBC_CA.crt" "%Folder%\ROOTCA_OSCCA.crt" "%Folder%\SZCA.crt" "%Folder%\SZCA_200307.crt" "%Folder%\TenpayCom_Root_CA.crt")
+
+
+:: Print to screen.
+:EXIT
+@echo.
+@echo RevokeChinaCerts Organization batch
+@echo Done, please confirm the messages on screen.
+@echo.
+@pause
diff --git a/Windows/RevokeChinaCerts_Restore.bat b/Windows/RevokeChinaCerts_Restore.bat
deleted file mode 100644
index b7a184fc66ae97c7c21fb829557eafc79ac02a32..0000000000000000000000000000000000000000
--- a/Windows/RevokeChinaCerts_Restore.bat
+++ /dev/null
@@ -1,147 +0,0 @@
-:: RevokeChinaCerts Restore batch
-:: Revoke China Certificates.
-:: 
-:: Author: JayXon, Chengr28
-:: 
-
-@echo off
-
-:: Update certificates list of system.
-cd /d %~dp0
-"%~dp0\Tools\RootSUPD_201403_x86"
-
-:: Architecture check
-set CertMgr="%~dp0\Tools\CertMgr"
-if "%PROCESSOR_ARCHITECTURE%%PROCESSOR_ARCHITEW6432%" == "x86" set CertMgr="%~dp0\Tools\CertMgr_x86"
-
-:: Restore certificates(Base part)
-::  Fake github.com(2013-01-25)
-%CertMgr% -del -c -sha1 27A29C3A8B3261770E8B59448557DC9E9339E68C -s Disallowed
-::  Fake google.com(2014-07-24)
-%CertMgr% -del -c -sha1 F6BEADB9BC02E0A152D71C318739CDECFC1C085D -s Disallowed
-::  Fake google.com(2014-09-18) [YFdyh000]
-%CertMgr% -del -c -sha1 316076F2866588DBB233C7F9EB68B58125150C21 -s Disallowed
-::  Fake yahoo.com(2014-09-30)
-%CertMgr% -del -c -sha1 2290C311EA0F3F57E06DF45B698E18E828E59BC3 -s Disallowed
-::  Fake hotmai.com(2014-10-02)
-%CertMgr% -del -c -sha1 30F3B3ADC6E570BDA606B9F96DE24190CE262C67 -s Disallowed
-::  Fake www.facebook.com(2014-10-08) [Yiwen Zhang]
-%CertMgr% -del -c -sha1 DC6EE6EDC4C078E1B2C12F6D1985000E27CFD318 -s Disallowed
-::  Fake www.icound.com(2014-10-04) [YFdyh000]
-%CertMgr% -del -c -sha1 F468B5F3FED807974476A22B32EA3137D924F7BA -s Disallowed
-::  Fake *.hotmail.com(2015-01-17) [YFdyh000]
-%CertMgr% -del -c -sha1 75F411595FE9A21A17A4967C7B666E5152791A32 -s Disallowed
-::  CNNIC ROOT
-%CertMgr% -del -c -sha1 8BAF4C9B1DF02A92F7DA128EB91BACF498604B6F -s Disallowed
-::  China Internet Network Information Center EV Certificates Root
-%CertMgr% -del -c -sha1 4F99AA93FB2BD13726A1994ACE7FF005F2935D1E -s Disallowed
-::  CNNIC SSL(Entrust)
-%CertMgr% -del -c -sha1 6856BB1A6C4F76DACA362187CC2CCD484EDDC25D -s Disallowed
-::  Baidu WACC service [SCFWSE]
-%CertMgr% -del -c -sha1 561422647B89BE22F203EBCAEF52B5007227510A -s Disallowed
-::  GiantRootCA
-%CertMgr% -del -c -sha1 7514436E903C901069980499CA70DE74FC06C83C -s Disallowed
-::  JGZXCA
-%CertMgr% -del -c -sha1 7A4AA61E2A88704115E47748D8647DAEE6837559 -s Disallowed
-::  Superfish, Inc. [Septembers/v998]
-%CertMgr% -del -c -sha1 C864484869D41D2B0D32319C5A62F9315AAF2CBD -s Disallowed
-
-:: Restore certificates(Extended part)
-::  CFCA GT CA(2011-06-13)
-%CertMgr% -del -c -sha1 EABDA240440ABBD694930A01D09764C6C2D77966 -s Disallowed
-::  CFCA GT CA(2012-08-21) [YFdyh000]
-%CertMgr% -del -c -sha1 A8F2DFE36AE0CC2DB9DD38347D30AED9551DD25A -s Disallowed
-::  CFCA EV ROOT
-%CertMgr% -del -c -sha1 E2B8294B5584AB6B58C290466CAC3FB8398F8483 -s Disallowed
-::  UCA Global Root
-%CertMgr% -del -c -sha1 0B972C9EA6E7CC58D93B20BF71EC412E7209FABF -s Disallowed
-::  UCA Root(2004-01-01)
-%CertMgr% -del -c -sha1 8250BED5A214433A66377CBC10EF83F669DA3A67 -s Disallowed
-::  UCA Extended Validation Root
-%CertMgr% -del -c -sha1 B9C9F58B3BBEF575E2B58328770E7B0076C40B5E -s Disallowed
-::  UCA ROOT(2001-01-01)
-%CertMgr% -del -c -sha1 3120F295417730075F8CD42D0CAE008EB5726EF8 -s Disallowed
-::  GoAgent CA [lenovo-me]
-%CertMgr% -del -c -sha1 AB702CDF18EBE8B438C52869CD4A5DEF48B40E33 -s Disallowed
-::  SZCA [yfdyh000]
-::%CertMgr% -del -c -sha1 B0049D436F27237EE59C746A1EF3C96A8E1B54AC -s Disallowed
-::  SZCA(2003-07-22) [yfdyh000]
-::%CertMgr% -del -c -sha1 90D7A97592F0A3E2165DE5DA23B57701D74A298D -s Disallowed
-
-:: Restore certificates(All part)
-::  ROOTCA OSCCA
-::%CertMgr% -del -c -sha1 DBB84423C928ABE889D0E368FC3191D151DDB1AB -s Disallowed
-::  SRCA
-%CertMgr% -del -c -sha1 AE3F2E66D48FC6BD1DF131E89D768D505DF14302 -s Disallowed
-::  Certification Authority of WoSign
-%CertMgr% -del -c -sha1 B94294BF91EA8FB64BE61097C7FB001359B676CB -s Disallowed
-::  Certification Authority of WoSign(Chinese)
-%CertMgr% -del -c -sha1 1632478D89F9213A92008563F5A4A7D312408AD6 -s Disallowed
-::  Class 1 Primary CA
-%CertMgr% -del -c -sha1 6A174570A916FBE84453EED3D070A1D8DA442829 -s Disallowed
-::  Certification Authority of WoSign(2009-08-08)
-%CertMgr% -del -c -sha1 33A4D8BC38608EF52EF0E28A35091E9250907FB9 -s Disallowed
-::  Certification Authority of WoSign 1(StartCom/2011-03-01)
-%CertMgr% -del -c -sha1 868241C8B85AF79E2DAC79EDADB723E82A36AFC3 -s Disallowed
-::  Certification Authority of WoSign 2(StartCom/2011-03-01)
-%CertMgr% -del -c -sha1 692790DA5189529CC5CE1E16E984277A03023E99 -s Disallowed
-::  Certification Authority of WoSign(StartCom/2006-09-18)
-%CertMgr% -del -c -sha1 804E5FB7DE84F5F5B28347233EAF07846B6070D3 -s Disallowed
-::  Certification Authority of WoSign(Chinese/StartCom) [v998]
-%CertMgr% -del -c -sha1 D8EFF6C28BB508E4702565F42748454A872BD412 -s Disallowed
-::  Certification Authority of WoSign(USERTrust) [v998]
-%CertMgr% -del -c -sha1 56FAADDC596DCF78D585D83A35BC04B690D12736 -s Disallowed
-::  WoSign Premium Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 E3D569137E603E7BACB6BCC66AE943850C8ADF38 -s Disallowed
-::  WoSign Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 3E14B8BD6C568657D852D95D387249AE857B4A39 -s Disallowed
-::  WoSign SGC Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 6D5A18050D56BFDE525CBE89E8C45DD1B53D12E9 -s Disallowed
-::  WoSign Client Authority(USERTrust)
-%CertMgr% -del -c -sha1 FAD4319D4E173FF3853E51C98D21919BF3DA1A1E -s Disallowed
-::  WoTrust Premium Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 381CBC5048AFD9A02D3E5882D5F22D962B1A5F72 -s Disallowed
-::  WoTrust Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 337DF96418F08A9355870513AFCEBDC68BCED767 -s Disallowed
-::  WoTrust SGC Server Authority(USERTrust)
-%CertMgr% -del -c -sha1 46A762F3C3CF3732DE22A8BA1EBBA3BC048F9B8C -s Disallowed
-::  WoTrust Client Authority(USERTrust)
-%CertMgr% -del -c -sha1 38CFE78D9F1F0B0637AFCAAA3D5549D87C0AA1D0 -s Disallowed
-::  China Trust Network(1) [QuantumGhost]
-::%CertMgr% -del -c -sha1 C2CAEB0DC296FD50596BCA0F53C5364521167039 -s Disallowed
-::  China Trust Network(2) [QuantumGhost]
-::%CertMgr% -del -c -sha1 B39B0B24B156D8B6123CAF7BA249DC81F27E39FA -s Disallowed
-::  China Trust Network(3) [QuantumGhost]
-::%CertMgr% -del -c -sha1 7C88AE178AE6AB8E69C30AF586D84EF29B6E6AE3 -s Disallowed
-::  Hongkong Post Root CA
-%CertMgr% -del -c -sha1 E0925E18C7765E22DABD9427529DA6AF4E066428 -s Disallowed
-::  Hongkong Post Root CA 1 [v998]
-%CertMgr% -del -c -sha1 D6DAA8208D09D2154D24B52FCB346EB258B28A58 -s Disallowed
-::  Macao Post eSignTrust Root Certification Authority
-%CertMgr% -del -c -sha1 89C32E6B524E4D65388B9ECEDC637134ED4193A3 -s Disallowed
-::  Macao Post eSignTrust Root Certification Authority(G02)
-%CertMgr% -del -c -sha1 06143151E02B45DDBADD5D8E56530DAAE328CF90 -s Disallowed
-::  ePKI Root Certification Authority
-%CertMgr% -del -c -sha1 67650DF17E8E7E5B8240A4F4564BCFE23D69C6F0 -s Disallowed
-::  Government Root Certification Authority
-%CertMgr% -del -c -sha1 F48B11BFDEABBE94542071E641DE6BBE882B40B9 -s Disallowed
-::  TWCA Global Root CA
-%CertMgr% -del -c -sha1 9CBB4853F6A4F6D352A4E83252556013F5ADAF65 -s Disallowed
-::  TWCA Root Certification Authority(1)
-%CertMgr% -del -c -sha1 CF9E876DD3EBFC422697A3B5A37AA076A9062348 -s Disallowed
-::  TWCA Root Certification Authority(2)
-%CertMgr% -del -c -sha1 DF646DCB7B0FD3A96AEE88C64E2D676711FF9D5F -s Disallowed
-::  TaiCA Secure CA
-%CertMgr% -del -c -sha1 5B404B6DB43E1F71557F75552E7668289B1B6309 -s Disallowed
-::  TWCA Secure CA
-%CertMgr% -del -c -sha1 3F3E6C4B33802A2FEA46C5CACA14770A40018899 -s Disallowed
-::  TWCA Secure Certification Authority
-%CertMgr% -del -c -sha1 339D811FEC673E7F731307A34C7C7523ABBE7DFE -s Disallowed
-
-:: Print to screen.
-::Exit
-@echo.
-@echo RevokeChinaCerts Restore version
-@echo Done. Please confirm the messages on screen.
-@echo.
-@pause
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/LocalPolicy.dll b/Windows/Tools/SoftCertPolicyAppender/LocalPolicy.dll
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/LocalPolicy.dll
rename to Windows/Tools/SoftCertPolicyAppender/LocalPolicy.dll
diff --git a/Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe b/Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe
new file mode 100644
index 0000000000000000000000000000000000000000..6d128dbaf42b7c6ea109687874feefe4cabe8ff6
Binary files /dev/null and b/Windows/Tools/SoftCertPolicyAppender/SoftCertPolicyAppender.exe differ
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/.gitignore b/Windows/Tools/SoftCertPolicyAppender/Source/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..60b0755a9eba0f05025fc7805256595a947d313c
--- /dev/null
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/.gitignore
@@ -0,0 +1,182 @@
+ï»¿## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+x64/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+#*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding addin-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+_NCrunch_*
+.*crunch*.local.xml
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+## TODO: If the tool you use requires repositories.config, also uncomment the next line
+#!packages/repositories.config
+
+# Windows Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+#diff backup
+*.orig
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/README.md b/Windows/Tools/SoftCertPolicyAppender/Source/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..963b928bafcd84774317351eabc44d55e22f5aea
--- /dev/null
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/README.md
@@ -0,0 +1,20 @@
+ï»¿## ä½¿ç”¨æ–¹æ³• ##
+SoftCertPolicyAppender.exe <å‚æ•°> <è¯ä¹¦è·¯å¾„>
+
+SoftCertPolicyAppender.exe <å‚æ•°> <è¯ä¹¦è·¯å¾„> <è¯ä¹¦è·¯å¾„2> ...
+
+**å‚æ•°è¯´æ˜Ž**
+
+- --set-force å¯ç”¨å¼ºåˆ¶ç–ç•¥
+- --unset-force å–æ¶ˆå¼ºåˆ¶ç–ç•¥
+- -r ç§»é™¤è¯ä¹¦è§„åˆ™
+- -h æ˜¾ç¤ºå¸®åŠ©ä¿¡æ¯
+
+
+## å¤‡æ³¨ ##
+- éœ€è¦ç®¡ç†å‘˜æƒé™ 
+- éœ€è¦[.net framework 4.0](http://www.microsoft.com/en-us/download/details.aspx?id=17718)
+
+
+## å¼•ç”¨ç»„ä»¶ ##
+[local-policy](https://bitbucket.org/MartinEden/local-policy/overview)
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender.sln
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/CertPolicyAppender.cs
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
similarity index 85%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
index ab16c2b8173d8d511b2c6b13e81cfb0ff6b14175..436a7649b7394f88944157e8ffab071b2c00252c 100644
--- a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Program.cs
@@ -14,15 +14,16 @@ namespace SoftCertPolicyAppender
 
             if (args.Contains("-h") || args.Contains("--help")||args.Length==0)
             {
-                const string usage = @"Usage:SoftwareRestrictionPolicyController.exe [OPTOION]... [CERTFILE]...
-config software restriction policy by cli
+                const string usage = @"Usage: SoftwareRestrictionPolicyController.exe [Option]... [CertFile]...
+Config software restriction policy by cli.
 
-OPTIONs
-  --set-force      set force certificate policy
-  --unset-force    unset force certificate policy
-  -r               remove certificate rule by CERTFILEs not add
-CERTFILEs
-  certificate file path that will add certificate rule
+Options:
+    --set-force      set force certificate policy.
+    --unset-force    unset force certificate policy.
+    -r               remove certificate rule by CERTFILEs not add.
+
+CertFiles:
+    Certificate file path that will add certificate rule.
 ";
                 Console.Write(usage);
                 return;
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
similarity index 95%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
index f0b951654606b531b51d56bbc2070b8e6138e80f..0da5aa03a6386a1afa6d686b8ec244636cf966f7 100644
--- a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AutoAddSoftCertPolicy")]
-[assembly: AssemblyCopyright("Copyright Â©  2014")]
+[assembly: AssemblyCopyright("Copyright Â© 2014 lhyqy5")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
similarity index 96%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
index 3f475b333b5711092adfc3932065e1c412fcda89..bbfbeea08a53311578b0264d9d3f97adbbecd937 100644
--- a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/SoftCertPolicyAppender.csproj
@@ -11,6 +11,7 @@
     <AssemblyName>SoftCertPolicyAppender</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -52,6 +53,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="app.manifest" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.config b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.config
new file mode 100644
index 0000000000000000000000000000000000000000..e2a5a1876245c765a0223d76c68ded6e5f0bd3ba
--- /dev/null
+++ b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.config
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest b/Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest
rename to Windows/Tools/SoftCertPolicyAppender/Source/SoftCertPolicyAppender/app.manifest
diff --git a/Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.dll b/Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.dll
new file mode 100644
index 0000000000000000000000000000000000000000..ce6182b9df0b1bd80182a285ce8e346af164932f
Binary files /dev/null and b/Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.dll differ
diff --git a/Windows/ArchiveCerts/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb b/Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb
similarity index 100%
rename from Windows/ArchiveCerts/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb
rename to Windows/Tools/SoftCertPolicyAppender/Source/_libs/LocalPolicy.pdb