diff --git a/Security-Tokens.md b/Security-Tokens.md
index b0ad4fa..56e91f3 100644
--- a/Security-Tokens.md
+++ b/Security-Tokens.md
@@ -30,12 +30,11 @@ Besides Fidesmo, YubiKey, we don't know of other NFC-enabled security tokens tha
 | Card | ykneo-openpgp | SmartPGP |
 |------|------|------|
 | [J3D081, JCOP v2.4.2 Card from cryptoshop.com](http://www.cryptoshop.com) | ✔ | 𐄂 |
-| [A22CR & A40CR from javacardos.com](http://www.javacardos.com) | NEEDS HACK; Secure Messaging support needs to be stripped from ykneo-openpgp | 𐄂 |
-| [NXP J3H081 SCP02 and SCP03 from motechno.com](https://www.motechno.com/buy/j3h081-jcop3/) | ? | MUST USE v3.0.1 branch. Install of cap file from master branch fails with ``INSTALL [for install and make selectable] failed: 0x6F00``. ``-default`` on install bricks card. |
-| NXP J3D081 | ? | Fails to install v3.0.1 branch |
 | Fidesmo | https://github.com/fidesmo/ykneo-openpgp/pull/1/files | |
+| Javacardos.com A22CR | see https://www.javacardos.com/javacardforum/viewforum.php?f=36 , uses stripped down version: https://github.com/JavaCardOS/OpenPGPApplet/compare/master...Yubico:master | |
 | NXP JCOP J2A040 | https://github.com/Yubico/ykneo-openpgp/issues/51 | |
-| Feitian A22CR | see https://www.javacardos.com/javacardforum/viewforum.php?f=36 , uses stripped down version: https://github.com/JavaCardOS/OpenPGPApplet/compare/master...Yubico:master | |
+| NXP J3D081 | ? | Fails to install v3.0.1 branch |
+| [NXP J3H081 SCP02 and SCP03 from motechno.com](https://www.motechno.com/buy/j3h081-jcop3/) | ? | MUST USE v3.0.1 branch. Install of cap file from master branch fails with ``INSTALL [for install and make selectable] failed: 0x6F00``. ``-default`` on install bricks card. |
 
 ## Are external USB Smartcard Reader supported?
 Not officially. However, you can turn on "Allow untested USB Devices", under experimental settings and try your reader. It must have a CCID interface and you should insert the OpenPGP card before plugging in the reader. We found that Nexus 5X reboots, but Nexus 6P works. Readers on [this page](https://pcsclite.alioth.debian.org/ccid/supported.html) will work with higher probability but we cannot provide any recommendations, we still recommend one of the supported security tokens from the table above. Some discussions about this is in [#1912](https://github.com/open-keychain/open-keychain/issues/1912)