diff --git a/docs/content/en/reference/integrations/time-based-one-time-password-apps.md b/docs/content/en/reference/integrations/time-based-one-time-password-apps.md
index 1800e9365..92aacfc5a 100644
--- a/docs/content/en/reference/integrations/time-based-one-time-password-apps.md
+++ b/docs/content/en/reference/integrations/time-based-one-time-password-apps.md
@@ -20,24 +20,6 @@ application is on this list that the information is correct for the current vers
 may now support some that were not previously supported, or in rare cases they may support less than they previously
 did.
 
+{{< table-totp-support >}}
 
-|      Application       |        Algorithm: SHA1         |       Algorithm: SHA256        |       Algorithm: SHA512        |           Digits: 6            |            Digits 8             |
-|:----------------------:|:------------------------------:|:------------------------------:|:------------------------------:|:------------------------------:|:-------------------------------:|
-| [Google Authenticator] | {{% support support="full" %}} |        {{% support %}}         |        {{% support %}}         | {{% support support="full" %}} |         {{% support %}}         |
-|      [Bitwarden]       | {{% support support="full" %}} | {{% support support="full" %}} | {{% support support="full" %}} | {{% support support="full" %}} | {{% support support="full" %}}  |
-| [Yubico Authenticator] | {{% support support="full" %}} |        {{% support %}}         |        {{% support %}}         | {{% support support="full" %}} | {{% support support="full" %}}  |
-|  [Authenticator Plus]  | {{% support support="full" %}} |        {{% support %}}         |        {{% support %}}         | {{% support support="full" %}} |         {{% support %}}         |
-|      [1Password]       | {{% support support="full" %}} | {{% support support="full" %}} |        {{% support %}}         | {{% support support="full" %}} |         {{% support %}}         |
-|        [Ravio]         | {{% support support="full" %}} | {{% support support="full" %}} |        {{% support %}}         | {{% support support="full" %}} |         {{% support %}}         |
-|        [Authy]         | {{% support support="full" %}} |        {{% support %}}         |        {{% support %}}         |        {{% support %}}         | {{% support  support="full" %}} |
-|        [Aegis]         | {{% support support="full" %}} |        {{% support %}}         | {{% support support="full" %}} | {{% support support="full" %}} | {{% support  support="full" %}} |
-
-[Google Authenticator]: https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en&gl=US&pli=1
-[Bitwarden]: https://bitwarden.com/
-[Yubico Authenticator]: https://www.yubico.com/products/yubico-authenticator/
-[Authenticator Plus]: https://www.authenticatorplus.com/
-[1Password]: https://1password.com/
-[Ravio]: https://raivo-otp.com/
-[Authy]: https://authy.com/
-[Aegis]: https://getaegis.app/
 
diff --git a/docs/data/support.json b/docs/data/support.json
new file mode 100644
index 000000000..507f9af16
--- /dev/null
+++ b/docs/data/support.json
@@ -0,0 +1,12 @@
+{
+  "totp": [
+    {"name": "Google Authenticator", "clear": false, "algorithms": {"SHA1": true, "SHA256": false, "SHA512": false}, "digits": {"six": true, "eight": false}, "url": "https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en&gl=US&pli=1"},
+    {"name": "Bitwarden", "clear": true, "algorithms": {"SHA1": true, "SHA256": true, "SHA512": true}, "digits": {"six": true, "eight": true}, "url": "https://bitwarden.com/"},
+    {"name": "Yubico Authenticator", "clear": true, "algorithms": {"SHA1": true, "SHA256": false, "SHA512": false}, "digits": {"six": true, "eight": true}, "url": "https://www.yubico.com/products/yubico-authenticator/"},
+    {"name": "Authenticator Plus", "clear": false, "algorithms": {"SHA1": true, "SHA256": false, "SHA512": false}, "digits": {"six": true, "eight": false}, "url": "https://www.authenticatorplus.com/"},
+    {"name": "1Password", "clear": false, "algorithms": {"SHA1": true, "SHA256": true, "SHA512": false}, "digits": {"six": true, "eight": false}, "url": "https://1password.com/"},
+    {"name": "Ravio", "clear": false, "algorithms": {"SHA1": true, "SHA256": true, "SHA512": false}, "digits": {"six": true, "eight": false}, "url": "https://raivo-otp.com/"},
+    {"name": "Authy", "clear": false, "algorithms": {"SHA1": true, "SHA256": false, "SHA512": false}, "digits": {"six": false, "eight": true}, "url": "https://authy.com/"},
+    {"name": "Aegis", "clear": false, "algorithms": {"SHA1": true, "SHA256": false, "SHA512": true}, "digits": {"six": true, "eight": true}, "url": "https://getaegis.app/"}
+  ]
+}
diff --git a/docs/layouts/shortcodes/table-totp-support.html b/docs/layouts/shortcodes/table-totp-support.html
new file mode 100644
index 000000000..4513d672b
--- /dev/null
+++ b/docs/layouts/shortcodes/table-totp-support.html
@@ -0,0 +1,28 @@
+<table class="table table-hover">
+  <thead>
+  <tr>
+    <th style="text-align: center;" rowspan="2">Application</th>
+    <th style="text-align: center;" colspan="3" class="border-end">Algorithm</th>
+    <th style="text-align: center;" colspan="2">Digits</th>
+  </tr>
+  <tr>
+    <th style="text-align: center;">SHA1</th>
+    <th style="text-align: center;">SHA256</th>
+    <th style="text-align: center;" class="border-end">SHA512</th>
+    <th style="text-align: center;">6</th>
+    <th style="text-align: center;">8</th>
+  </tr>
+  </thead>
+  <tbody>
+  {{- range $.Site.Data.support.totp }}
+  <tr>
+    <td style="text-align: center;"><a href="{{ .url }}" target="_blank">{{ .name }}</a></td>
+    <td style="text-align: center;"><i class="{{ cond .algorithms.SHA1 "icon-support-full" "icon-support-none" }}" data-toggle="tooltip" data-placement="top" title="{{ cond .algorithms.SHA1 "" "Not " }}Supported"></i></td>
+    <td style="text-align: center;"><i class="{{ cond .algorithms.SHA256 "icon-support-full" "icon-support-none" }}" data-toggle="tooltip" data-placement="top" title="{{ cond .algorithms.SHA256 "" "Not " }}Supported"></i></td>
+    <td style="text-align: center;" class="border-end"><i class="{{ cond .algorithms.SHA512 "icon-support-full" "icon-support-none" }}" data-toggle="tooltip" data-placement="top" title="{{ cond .algorithms.SHA512 "" "Not " }}Supported"></i></td>
+    <td style="text-align: center;"><i class="{{ cond .digits.six "icon-support-full" "icon-support-none" }}" data-toggle="tooltip" data-placement="top" title="{{ cond .digits.six "" "Not " }}Supported"></i></td>
+    <td style="text-align: center;"><i class="{{ cond .digits.eight "icon-support-full" "icon-support-none" }}" data-toggle="tooltip" data-placement="top" title="{{ cond .digits.eight "" "Not " }}Supported"></i></td>
+  </tr>
+  {{- end }}
+  </tbody>
+</table>
\ No newline at end of file