diff --git a/Security-Tokens.md b/Security-Tokens.md
index 5b38583..486d58f 100644
--- a/Security-Tokens.md
+++ b/Security-Tokens.md
@@ -1,24 +1,24 @@
 # Supported NFC/USB Security Tokens
 
-| Token | Supported? | NFC | USB | sign/ decrypt | setup (put key/ reset) | Implementation |
-|------|------|------|------|------|------|------|
-| [Fidesmo](https://www.fidesmo.com/) | FULL | ✔ | 𐄂  | ✔ | ✔ | [fork of ykneo-openpgp](https://github.com/fidesmo/ykneo-openpgp) |
-| [Gnuk](https://www.fsij.org/gnuk/) | FULL if >= 1.2.5 | 𐄂 | OTG | ✔ | >= 1.2.5 | [gnuk](http://git.gniibe.org/gitweb/?p=gnuk/gnuk.git) |
-| [Nitrokey Start](https://www.nitrokey.com) | FULL if >= 1.2.5 | 𐄂 | OTG | ✔ | >= 1.2.5 | [fork of gnuk](https://github.com/Nitrokey/nitrokey-start-firmware) |
-| [Nitrokey Pro](https://www.nitrokey.com) | FULL | 𐄂 | OTG | ✔ | ✔ | [nitrokey-pro-firmware CcidLocalAccess.c](https://github.com/Nitrokey/nitrokey-pro-firmware/blob/master/src/ccid/CcidLocalAccess.c) |
-| [Nitrokey Storage](https://www.nitrokey.com) | FULL | 𐄂 | OTG | ✔ | ✔ | [nitrokey-storage-firmware OpenPGP_V20.c](https://github.com/Nitrokey/nitrokey-storage-firmware/blob/master/src/CCID/LOCAL_ACCESS/OpenPGP_V20.c) |
-| [YubiKey NEO](https://www.yubico.com/products/yubikey-hardware/yubikey-neo/) | FULL | ✔ | OTG | ✔ | ✔ | [ykneo-openpgp](https://github.com/yubico/ykneo-openpgp) |
-| [YubiKey 4](https://www.yubico.com/product/yubikey-4-series/) | FULL | 𐄂 | OTG | ✔ | ✔ | closed |
-| [YubiKey 4 Nano](https://www.yubico.com/product/yubikey-4-series/) | FULL | 𐄂 | OTG | ✔ | ✔ | closed |
-| [YubiKey 4C](https://www.yubico.com/product/yubikey-4-series/) | FULL | 𐄂 | USB-C | ✔ | ✔ | closed |
-| [YubiKey 4C Nano](https://www.yubico.com/product/yubikey-4-series/) | FULL | 𐄂 | USB-C | ✔ | ✔ | closed |
+| Token | Supported? | NFC | USB | supported algos | Implementation |
+|------|------|------|------|------|------|
+| [Fidesmo Card](https://www.fidesmo.com/) | ✔ | ✔ | 𐄂 | ? | [fork of ykneo-openpgp](https://github.com/fidesmo/ykneo-openpgp) |
+| [Gnuk](https://www.fsij.org/gnuk/) | ✔ >= 1.2.5 | 𐄂 | OTG | ? | [gnuk](http://git.gniibe.org/gitweb/?p=gnuk/gnuk.git) |
+| [Nitrokey Start](https://www.nitrokey.com) | ✔ >= 1.2.5 | 𐄂 | OTG | ? | [fork of gnuk](https://github.com/Nitrokey/nitrokey-start-firmware) |
+| [Nitrokey Pro](https://www.nitrokey.com) | ✔ | 𐄂 | OTG | ? | [nitrokey-pro-firmware CcidLocalAccess.c](https://github.com/Nitrokey/nitrokey-pro-firmware/blob/master/src/ccid/CcidLocalAccess.c) |
+| [Nitrokey Storage](https://www.nitrokey.com) | ✔ | 𐄂 | OTG | ? | [nitrokey-storage-firmware OpenPGP_V20.c](https://github.com/Nitrokey/nitrokey-storage-firmware/blob/master/src/CCID/LOCAL_ACCESS/OpenPGP_V20.c) |
+| [YubiKey NEO](https://www.yubico.com/products/yubikey-hardware/yubikey-neo/) | ✔ | ✔ | OTG | ? | [ykneo-openpgp](https://github.com/yubico/ykneo-openpgp) |
+| [YubiKey 4](https://www.yubico.com/product/yubikey-4-series/) | ✔ | 𐄂 | OTG | ? | closed |
+| [YubiKey 4 Nano](https://www.yubico.com/product/yubikey-4-series/) | ✔ | 𐄂 | OTG | ? | closed |
+| [YubiKey 4C](https://www.yubico.com/product/yubikey-4-series/) | ✔ | 𐄂 | USB-C | ? | closed |
+| [YubiKey 4C Nano](https://www.yubico.com/product/yubikey-4-series/) | ✔ | 𐄂 | USB-C | ? | closed |
 
 # NOT supported
 
-| Token | Supported? | NFC | USB | sign/ decrypt | setup (put key/ reset) | Implementation |
-|------|------|------|------|------|------|------|
-| [Ledger Nano S](https://www.ledgerwallet.com/products/12-ledger-na𐄂-s) | NO ([#2135](https://github.com/open-keychain/open-keychain/issues/2135)) | 𐄂 | OTG | 𐄂 | 𐄂 | [blue-app-openpgp-card](https://github.com/LedgerHQ/blue-app-openpgp-card) |
-| [TREZOR 2](https://trezor.io/) | NO | 𐄂 | OTG | 𐄂 | 𐄂 | Not OpenPGP Card Spec compatible |
+| Token | Supported? | NFC | USB  | Implementation |
+|------|------|------|------|------|
+| [Ledger Nano S](https://www.ledgerwallet.com/products/12-ledger-na𐄂-s) | NO ([#2135](https://github.com/open-keychain/open-keychain/issues/2135)) | 𐄂 | OTG | [blue-app-openpgp-card](https://github.com/LedgerHQ/blue-app-openpgp-card) |
+| [TREZOR 2](https://trezor.io/) | NO | 𐄂 | OTG | Not OpenPGP Card Spec compatible |
 
 
 ## NFC on-card key-gen