diff --git a/_wallets/airbitzwallet.md b/_wallets/airbitzwallet.md
index 28f5904f..45e11b5c 100644
--- a/_wallets/airbitzwallet.md
+++ b/_wallets/airbitzwallet.md
@@ -4,61 +4,40 @@ title: "Airbitz Bitcoin Wallet"
 titleshort: "Airbitz"
 compat: "mobile android ios"
 level: 3
-
 platform:
-  mobile:
-    text: "walletairbitzwallet"
-    link: "https://airbitz.co/bitcoin-wallet/"
-    source: "https://github.com/Airbitz"
-    screenshot: "airbitzwalletios.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    - ios
-    check:
-      control: "checkpasscontrolhybrid"
-      validation: "checkpassvalidationservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletairbitzwallet"
-    link: "https://play.google.com/store/apps/details?id=com.airbitz"
-    source: "https://github.com/Airbitz"
-    screenshot: "airbitzwalletandroid.png"
-    os:
-    - android
-    check:
-      control: "checkpasscontrolhybrid"
-      validation: "checkpassvalidationservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  ios:
-    text: "walletairbitzwallet"
-    link: "https://itunes.apple.com/us/app/bitcoin-wallet-map-directory/id843536046?mt=8"
-    source: "https://github.com/Airbitz"
-    screenshot: "airbitzwalletios.png"
-    os:
-    - ios
-    check:
-      control: "checkpasscontrolhybrid"
-      validation: "checkpassvalidationservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletairbitzwallet"
+        link: "https://play.google.com/store/apps/details?id=com.airbitz"
+        source: "https://github.com/Airbitz"
+        screenshot: "airbitzwalletandroid.png"
+        check:
+          control: "checkpasscontrolhybrid"
+          validation: "checkpassvalidationservers"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: ios
+        text: "walletairbitzwallet"
+        link: "https://itunes.apple.com/us/app/bitcoin-wallet-map-directory/id843536046?mt=8"
+        source: "https://github.com/Airbitz"
+        screenshot: "airbitzwalletios.png"
+        check:
+          control: "checkpasscontrolhybrid"
+          validation: "checkpassvalidationservers"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
 ---
diff --git a/_wallets/arcbit.md b/_wallets/arcbit.md
index 1959ab16..3afef038 100644
--- a/_wallets/arcbit.md
+++ b/_wallets/arcbit.md
@@ -5,79 +5,64 @@ titleshort: "ArcBit"
 compat: "mobile desktop android ios windows mac linux"
 level: 3
 platform:
-  mobile:
-    text: "walletarcbit"
-    link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888"
-    source: "https://github.com/arcbit/arcbit-ios"
-    screenshot: "arcbitios.png"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletarcbit"
+      link: "https://chrome.google.com/webstore/detail/arcbit-bitcoin-wallet/dkceiphcnbfahjbomhpdgjmphnpgogfk"
+      source: "https://github.com/arcbit/arcbit-web"
+      screenshot: "arcbitdesktop.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkfailvalidationcentralized"
+        transparency: "checkfailtransparencyremote"
+        environment: "checkfailenvironmentdesktop"
+        privacy: "checkpassprivacybasic"
+        fees: "checkpassfeecontroloverride"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkfailprivacydisclosurecentralized"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - ios
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroloverride"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  desktop:
-    text: "walletarcbit"
-    link: "https://chrome.google.com/webstore/detail/arcbit-bitcoin-wallet/dkceiphcnbfahjbomhpdgjmphnpgogfk"
-    source: "https://github.com/arcbit/arcbit-web"
-    screenshot: "arcbitdesktop.png"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
+  - mobile:
+    name: mobile
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroloverride"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
-  ios:
-    text: "walletarcbit"
-    link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888"
-    source: "https://github.com/arcbit/arcbit-ios"
-    screenshot: "arcbitios.png"
-    os:
-    - ios
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroloverride"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletarcbit"
-    link: "https://play.google.com/store/apps/details?id=com.arcbit.arcbit"
-    source: "https://github.com/arcbit/arcbit-android"
-    screenshot: "arcbitios.png"
-    os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroloverride"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: ios
+        text: "walletarcbit"
+        link: "https://itunes.apple.com/app/arcbit-bitcoin-wallet/id999487888"
+        source: "https://github.com/arcbit/arcbit-ios"
+        screenshot: "arcbitios.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroloverride"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurecentralized"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletarcbit"
+        link: "https://play.google.com/store/apps/details?id=com.arcbit.arcbit"
+        source: "https://github.com/arcbit/arcbit-android"
+        screenshot: "arcbitios.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroloverride"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurecentralized"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
 ---
diff --git a/_wallets/armory.md b/_wallets/armory.md
index 951f8f68..d8fd5e89 100644
--- a/_wallets/armory.md
+++ b/_wallets/armory.md
@@ -5,24 +5,29 @@ titleshort: "Armory"
 compat: "desktop windows mac linux"
 level: 2
 platform:
-  desktop:
-    text: "walletarmory"
-    link: "https://btcarmory.com/"
-    source: "https://github.com/goatpig/BitcoinArmory"
-    screenshot: "armory.png"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletarmory"
+      link: "https://btcarmory.com/"
+      source: "https://github.com/goatpig/BitcoinArmory"
+      screenshot: "armory.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkgoodvalidationfullnoderequired"
+        transparency: "checkpasstransparencyopensource"
+        environment: "checkfailenvironmentdesktop"
+        privacy: "checkgoodprivacyimproved"
+        fees: "checkgoodfeecontrolfull"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkpassprivacydisclosurefullnode"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkgoodvalidationfullnoderequired"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkgoodprivacyimproved"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkpassprivacydisclosurefullnode"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
 ---
diff --git a/_wallets/bitcoincore.md b/_wallets/bitcoincore.md
index 2d51e6bb..9e6806cf 100644
--- a/_wallets/bitcoincore.md
+++ b/_wallets/bitcoincore.md
@@ -5,24 +5,29 @@ titleshort: "Bitcoin<br>Core"
 compat: "desktop windows mac linux"
 level: 1
 platform:
-  desktop:
-    text: "walletbitcoinqt"
-    link: "bitcoincore"
-    source: "https://github.com/bitcoin/bitcoin"
-    screenshot: "bitcoincore.png"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletbitcoincore"
+      link: "bitcoincore"
+      source: "https://github.com/bitcoin/bitcoin"
+      screenshot: "bitcoincore.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkgoodvalidationfullnode"
+        transparency: "checkgoodtransparencydeterministic"
+        environment: "checkfailenvironmentdesktop"
+        privacy: "checkgoodprivacyimproved"
+        fees: "checkgoodfeecontrolfull"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkpassprivacydisclosurefullnode"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkgoodvalidationfullnode"
-      transparency: "checkgoodtransparencydeterministic"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkgoodprivacyimproved"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkpassprivacydisclosurefullnode"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
 ---
diff --git a/_wallets/bitcoinknots.md b/_wallets/bitcoinknots.md
index 11c982d1..a6086d78 100644
--- a/_wallets/bitcoinknots.md
+++ b/_wallets/bitcoinknots.md
@@ -5,24 +5,29 @@ titleshort: "Bitcoin<br>Knots"
 compat: "desktop windows mac linux"
 level: 1
 platform:
-  desktop:
-    text: "walletbitcoinknots"
-    link: "https://bitcoinknots.org/"
-    source: "https://github.com/bitcoinknots/bitcoin/"
-    screenshot: "bitcoinknots.png"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletbitcoinknots"
+      link: "https://bitcoinknots.org/"
+      source: "https://github.com/bitcoinknots/bitcoin/"
+      screenshot: "bitcoinknots.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkgoodvalidationfullnode"
+        transparency: "checkgoodtransparencydeterministic"
+        environment: "checkfailenvironmentdesktop"
+        privacy: "checkgoodprivacyimproved"
+        fees: "checkgoodfeecontrolfull"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkpassprivacydisclosurefullnode"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkgoodvalidationfullnode"
-      transparency: "checkgoodtransparencydeterministic"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkgoodprivacyimproved"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkpassprivacydisclosurefullnode"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
 ---
diff --git a/_wallets/bitcoinwallet.md b/_wallets/bitcoinwallet.md
index 3a7b2e74..74fff826 100644
--- a/_wallets/bitcoinwallet.md
+++ b/_wallets/bitcoinwallet.md
@@ -5,61 +5,42 @@ titleshort: "Bitcoin<br>Wallet"
 compat: "mobile android blackberry"
 level: 2
 platform:
-  mobile:
-    text: "walletbitcoinwallet"
-    link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet"
-    source: "https://github.com/bitcoin-wallet/bitcoin-wallet"
-    screenshot: "bitcoinwalletandroid.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    - blackberry
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletbitcoinwallet"
-    link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet"
-    source: "https://github.com/bitcoin-wallet/bitcoin-wallet"
-    screenshot: "bitcoinwalletandroid.png"
-    os:
-    - android
-    - blackberry
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  blackberry:
-    text: "walletbitcoinwallet"
-    link: "https://appworld.blackberry.com/webstore/content/23952882/"
-    source: "https://github.com/bitcoin-wallet/bitcoin-wallet"
-    screenshot: "bitcoinwalletandroid.png"
-    os:
-    - android
-    - blackberry
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletbitcoinwallet"
+        link: "https://play.google.com/store/apps/details?id=de.schildbach.wallet"
+        source: "https://github.com/bitcoin-wallet/bitcoin-wallet"
+        screenshot: "bitcoinwalletandroid.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: blackberry
+        text: "walletbitcoinwallet"
+        link: "https://appworld.blackberry.com/webstore/content/23952882/"
+        source: "https://github.com/bitcoin-wallet/bitcoin-wallet"
+        screenshot: "bitcoinwalletandroid.png"
+        os:
+        - android
+        - blackberry
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
 ---
diff --git a/_wallets/bitgo.md b/_wallets/bitgo.md
index 627fc04a..04018fa9 100644
--- a/_wallets/bitgo.md
+++ b/_wallets/bitgo.md
@@ -5,40 +5,48 @@ titleshort: "BitGo"
 compat: "web desktop windows mac linux"
 level: 3
 platform:
-  desktop:
-    text: "walletbitgo"
-    link: "https://chrome.google.com/webstore/detail/bitgo/jlgeogaipkoajobchncghcojanffjfhl"
-    source: "https://github.com/BitGo/bitgo-chrome"
-    screenshot: "bitgo.png"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletbitgo"
+      link: "https://chrome.google.com/webstore/detail/bitgo/jlgeogaipkoajobchncghcojanffjfhl"
+      source: "https://github.com/BitGo/bitgo-chrome"
+      screenshot: "bitgo.png"
+      check:
+        control: "checkpasscontrolmulti"
+        validation: "checkfailvalidationcentralized"
+        transparency: "checkfailtransparencyremote"
+        environment: "checkpassenvironmenttwofactor"
+        privacy: "checkpassprivacybasic"
+        fees: "checkpassfeecontroldynamic"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkfailprivacydisclosureaccount"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
-  web:
-    text: "walletbitgo"
-    link: "https://www.bitgo.com/"
-    screenshot: "bitgo.png"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
+  - web:
+    name: web
     os:
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: web
+        text: "walletbitgo"
+        link: "https://www.bitgo.com/"
+        screenshot: "bitgo.png"
+        os:
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencyremote"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/bither.md b/_wallets/bither.md
index 9d6b22fa..e2d4fe94 100644
--- a/_wallets/bither.md
+++ b/_wallets/bither.md
@@ -5,78 +5,64 @@ titleshort: "Bither"
 compat: "mobile ios android desktop windows mac linux"
 level: 2
 platform:
-  mobile:
-    text: "walletbither"
-    link: "https://itunes.apple.com/us/app/bither/id899478936"
-    source: "https://github.com/bither/bither-ios"
-    screenshot: "bithermobile.png"
+  - mobile:
+    name: mobile
     os:
-    - ios
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkfailprivacyweak"
-      fees: "checkfailfeecontrolstatic"
-    privacycheck:
-      privacyaddressreuse: "checkfailprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  ios:
-    text: "walletbither"
-    link: "https://itunes.apple.com/us/app/bither/id899478936"
-    source: "https://github.com/bither/bither-ios"
-    screenshot: "bithermobile.png"
+      - name: ios
+        text: "walletbither"
+        link: "https://itunes.apple.com/us/app/bither/id899478936"
+        source: "https://github.com/bither/bither-ios"
+        screenshot: "bithermobile.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkfailprivacyweak"
+          fees: "checkfailfeecontrolstatic"
+        privacycheck:
+          privacyaddressreuse: "checkfailprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletbither"
+        link: "https://play.google.com/store/apps/details?id=net.bither"
+        source: "https://github.com/bither/bither-android"
+        screenshot: "bithermobile.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkfailprivacyweak"
+          fees: "checkfailfeecontrolstatic"
+        privacycheck:
+          privacyaddressreuse: "checkfailprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletbither"
+      link: "https://bither.net"
+      source: "https://github.com/bither/bither-desktop-java"
+      screenshot: "bitherdesktop.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkpassvalidationspvp2p"
+        transparency: "checkpasstransparencyopensource"
+        environment: "checkfailenvironmentdesktop"
+        privacy: "checkfailprivacyweak"
+        fees: "checkfailfeecontrolstatic"
+      privacycheck:
+        privacyaddressreuse: "checkfailprivacyaddressrotation"
+        privacydisclosure: "checkfailprivacydisclosurespv"
+        privacynetwork: "checkfailprivacynetworknosupporttor"
     os:
-    - ios
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkfailprivacyweak"
-      fees: "checkfailfeecontrolstatic"
-    privacycheck:
-      privacyaddressreuse: "checkfailprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletbither"
-    link: "https://play.google.com/store/apps/details?id=net.bither"
-    source: "https://github.com/bither/bither-android"
-    screenshot: "bithermobile.png"
-    os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkfailprivacyweak"
-      fees: "checkfailfeecontrolstatic"
-    privacycheck:
-      privacyaddressreuse: "checkfailprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  desktop:
-    text: "walletbither"
-    link: "https://bither.net"
-    source: "https://github.com/bither/bither-desktop-java"
-    screenshot: "bitherdesktop.png"
-    os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkfailprivacyweak"
-      fees: "checkfailfeecontrolstatic"
-    privacycheck:
-      privacyaddressreuse: "checkfailprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
 ---
diff --git a/_wallets/breadwallet.md b/_wallets/breadwallet.md
index 5c49bf24..8bb8826d 100644
--- a/_wallets/breadwallet.md
+++ b/_wallets/breadwallet.md
@@ -5,59 +5,39 @@ titleshort: "breadwallet"
 compat: "mobile android ios"
 level: 2
 platform:
-  mobile:
-    text: "walletbreadwallet"
-    link: "https://itunes.apple.com/app/breadwallet/id885251393"
-    source: "https://github.com/voisine/breadwallet"
-    screenshot: "breadwallet.png"
+  - mobile:
+    name: mobile
     os:
-    - ios
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  ios:
-    text: "walletbreadwallet"
-    link: "https://itunes.apple.com/app/breadwallet/id885251393"
-    source: "https://github.com/voisine/breadwallet"
-    screenshot: "breadwallet.png"
-    os:
-    - ios
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletbreadwallet"
-    link: "https://play.google.com/store/apps/details?id=com.breadwallet"
-    source: "https://github.com/breadwallet/breadwallet-android"
-    screenshot: "breadwallet.png"
-    os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: ios
+        text: "walletbreadwallet"
+        link: "https://itunes.apple.com/app/breadwallet/id885251393"
+        source: "https://github.com/voisine/breadwallet"
+        screenshot: "breadwallet.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletbreadwallet"
+        link: "https://play.google.com/store/apps/details?id=com.breadwallet"
+        source: "https://github.com/breadwallet/breadwallet-android"
+        screenshot: "breadwallet.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
 ---
diff --git a/_wallets/btc.com.md b/_wallets/btc.com.md
index aa20a74f..4f179336 100644
--- a/_wallets/btc.com.md
+++ b/_wallets/btc.com.md
@@ -5,76 +5,58 @@ titleshort: "BTC.com"
 compat: "mobile web android ios"
 level: 3
 platform:
-  mobile:
-    text: "walletbtccom"
-    link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet"
-    source: "https://github.com/blocktrail/blocktrail-wallet"
-    screenshot: "btccomwallet.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    - ios
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  web:
-    text: "walletbtccom"
-    link: "https://wallet.btc.com"
-    source: "https://github.com/blocktrail/blocktrail-webwallet"
-    screenshot: "btccomwallet.png"
+      - name: ios
+        text: "walletbtccom"
+        link: "https://itunes.apple.com/us/app/blocktrail-bitcoin-wallet/id1019614423"
+        source: "https://github.com/blocktrail/blocktrail-wallet"
+        screenshot: "btccomwallet.png"
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletbtccom"
+        link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet"
+        source: "https://github.com/blocktrail/blocktrail-wallet"
+        screenshot: "btccomwallet.png"
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+  - web:
+    name: web
     os:
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
-  ios:
-    text: "walletbtccom"
-    link: "https://itunes.apple.com/us/app/blocktrail-bitcoin-wallet/id1019614423"
-    source: "https://github.com/blocktrail/blocktrail-wallet"
-    screenshot: "btccomwallet.png"
-    os:
-    - ios
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletbtccom"
-    link: "https://play.google.com/store/apps/details?id=com.blocktrail.mywallet"
-    source: "https://github.com/blocktrail/blocktrail-wallet"
-    screenshot: "btccomwallet.png"
-    os:
-    - android
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: web
+        text: "walletbtccom"
+        link: "https://wallet.btc.com"
+        source: "https://github.com/blocktrail/blocktrail-webwallet"
+        screenshot: "btccomwallet.png"
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencyremote"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/coinapult.md b/_wallets/coinapult.md
index 2e8bce64..f398a154 100644
--- a/_wallets/coinapult.md
+++ b/_wallets/coinapult.md
@@ -5,19 +5,21 @@ titleshort: "Coinapult"
 compat: "web"
 level: 4
 platform:
-  web:
-    text: "walletcoinapult"
-    link: "https://coinapult.com/"
-    screenshot: "coinapult.png"
+  - web:
+    name: web
     os:
-    check:
-      control: "checkfailcontrolthirdparty"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkpassprivacybasic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: web
+        text: "walletcoinapult"
+        link: "https://coinapult.com/"
+        screenshot: "coinapult.png"
+        check:
+          control: "checkfailcontrolthirdparty"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencyremote"
+          environment: "checkfailenvironmentdesktop"
+          privacy: "checkpassprivacybasic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/coinbase.md b/_wallets/coinbase.md
index 6d06ddd6..0c2f4cd2 100644
--- a/_wallets/coinbase.md
+++ b/_wallets/coinbase.md
@@ -5,19 +5,21 @@ titleshort: "Coinbase"
 compat: "web"
 level: 4
 platform:
-  web:
-    text: "walletcoinbase"
-    link: "https://coinbase.com"
-    screenshot: "coinbase.png"
+  - web:
+    name: web
     os:
-    check:
-      control: "checkfailcontrolthirdparty"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkpassprivacybasic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: web
+        text: "walletcoinbase"
+        link: "https://coinbase.com"
+        screenshot: "coinbase.png"
+        check:
+          control: "checkfailcontrolthirdparty"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencyremote"
+          environment: "checkfailenvironmentdesktop"
+          privacy: "checkpassprivacybasic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/coinspace.md b/_wallets/coinspace.md
index 419eb723..1acd3c09 100644
--- a/_wallets/coinspace.md
+++ b/_wallets/coinspace.md
@@ -5,95 +5,74 @@ titleshort: "Coin.Space"
 compat: "mobile web android windowsphone ios"
 level: 3
 platform:
-  mobile:
-    text: "walletcoinspace"
-    link: "https://play.google.com/store/apps/details?id=com.coinspace.app"
-    source: "https://github.com/CoinSpace/CoinSpace"
-    screenshot: "coinspacemobile.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    - ios
-    - windowsphone
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencynew"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletcoinspace"
-    link: "https://play.google.com/store/apps/details?id=com.coinspace.app"
-    source: "https://github.com/CoinSpace/CoinSpace"
-    screenshot: "coinspacemobile.png"
+      - name: android
+        text: "walletcoinspace"
+        link: "https://play.google.com/store/apps/details?id=com.coinspace.app"
+        source: "https://github.com/CoinSpace/CoinSpace"
+        screenshot: "coinspacemobile.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencynew"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: ios
+        text: "walletcoinspace"
+        link: "https://itunes.apple.com/us/app/coinspace-bitcoin-wallet/id980719434?mt=8"
+        source: "https://github.com/CoinSpace/CoinSpace"
+        screenshot: "coinspacemobile.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencynew"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: windowsphone
+        text: "walletcoinspace"
+        link: "https://www.microsoft.com/en-us/store/apps/coin-space-digital-currency-wallet/9nblgggz58z9"
+        source: "https://github.com/CoinSpace/CoinSpace"
+        screenshot: "coinspacemobile.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencynew"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+  - web:
+    name: web
     os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencynew"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  ios:
-    text: "walletcoinspace"
-    link: "https://itunes.apple.com/us/app/coinspace-bitcoin-wallet/id980719434?mt=8"
-    source: "https://github.com/CoinSpace/CoinSpace"
-    screenshot: "coinspacemobile.png"
-    os:
-    - ios
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencynew"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  windowsphone:
-    text: "walletcoinspace"
-    link: "https://www.microsoft.com/en-us/store/apps/coin-space-digital-currency-wallet/9nblgggz58z9"
-    source: "https://github.com/CoinSpace/CoinSpace"
-    screenshot: "coinspacemobile.png"
-    os:
-    - windowsphone
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencynew"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  web:
-    text: "walletcoinspace"
-    link: "https://coin.space"
-    source: "https://github.com/CoinSpace/CoinSpace"
-    screenshot: "coinspaceweb.png"
-    os:
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: web
+        text: "walletcoinspace"
+        link: "https://coin.space"
+        source: "https://github.com/CoinSpace/CoinSpace"
+        screenshot: "coinspaceweb.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencyremote"
+          environment: "checkfailenvironmentdesktop"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/copay.md b/_wallets/copay.md
index 9c2cdc69..d0ca6ca0 100644
--- a/_wallets/copay.md
+++ b/_wallets/copay.md
@@ -5,44 +5,54 @@ titleshort: "Copay"
 compat: "mobile desktop web android ios windowsphone windows mac linux"
 level: 3
 platform:
-  mobile:
-    text: "walletcopay"
-    link: "https://copay.io"
-    source: "https://github.com/bitpay/copay"
-    screenshot: "copay.png"
+  - mobile:
+    name: mobile
+    default: &DEFAULT
+      text: "walletcopay"
+      link: "https://copay.io"
+      source: "https://github.com/bitpay/copay"
+      screenshot: "copay.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkfailvalidationcentralized"
+        transparency: "checkpasstransparencyopensource"
+        environment: "checkpassenvironmentmobile"
+        privacy: "checkpassprivacybasic"
+        fees: "checkpassfeecontroldynamic"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkfailprivacydisclosurecentralized"
+        privacynetwork: "checkfailprivacynetworknosupporttor"
     os:
-    - android
-    - ios
-    - windowsphone
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  desktop:
-    text: "walletcopay"
-    link: "https://copay.io/"
-    source: "https://github.com/bitpay/copay"
-    screenshot: "copay.png"
+      - name: android
+        <<: *DEFAULT
+      - name: ios
+        <<: *DEFAULT
+      - name: windowsphone
+        <<: *DEFAULT
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletcopay"
+      link: "https://copay.io/"
+      source: "https://github.com/bitpay/copay"
+      screenshot: "copay.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkfailvalidationcentralized"
+        transparency: "checkpasstransparencyopensource"
+        environment: "checkfailenvironmentdesktop"
+        privacy: "checkpassprivacybasic"
+        fees: "checkpassfeecontroldynamic"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkfailprivacydisclosurecentralized"
+        privacynetwork: "checkfailprivacynetworknosupporttor"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
 ---
diff --git a/_wallets/digitalbitbox.md b/_wallets/digitalbitbox.md
index 64ca0f79..c8d6d502 100644
--- a/_wallets/digitalbitbox.md
+++ b/_wallets/digitalbitbox.md
@@ -5,16 +5,19 @@ titleshort: "Digital<br />Bitbox"
 compat: "hardware"
 level: 2
 platform:
-  hardware:
-    text: "walletdbb"
-    link: "https://digitalbitbox.com/"
-    source: "https://github.com/digitalbitbox/"
-    screenshot: "digitalbitbox.png"
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkneutralvalidationvariable"
-      transparency: "checkfailtransparencynew"
-      environment: "checkgoodenvironmenthardware"
-      privacy: "checkneutralprivacyvariable"
-      fees: "checkneutralfeecontrolvariable"
+  - hardware:
+    name: hardware
+    os:
+      - name: hardware
+        text: "walletdbb"
+        link: "https://digitalbitbox.com/"
+        source: "https://github.com/digitalbitbox/"
+        screenshot: "digitalbitbox.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkneutralvalidationvariable"
+          transparency: "checkfailtransparencynew"
+          environment: "checkgoodenvironmenthardware"
+          privacy: "checkneutralprivacyvariable"
+          fees: "checkneutralfeecontrolvariable"
 ---
diff --git a/_wallets/electrum.md b/_wallets/electrum.md
index 8c48ad22..2a7c228e 100644
--- a/_wallets/electrum.md
+++ b/_wallets/electrum.md
@@ -5,42 +5,48 @@ titleshort: "Electrum"
 compat: "desktop windows mac linux mobile android"
 level: 2
 platform:
-  desktop:
-    text: "walletelectrum"
-    link: "https://electrum.org"
-    source: "https://github.com/spesmilo/electrum"
-    screenshot: "electrum.png"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletelectrum"
+      link: "https://electrum.org"
+      source: "https://github.com/spesmilo/electrum"
+      screenshot: "electrum.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkpassvalidationspvservers"
+        transparency: "checkpasstransparencyopensource"
+        environment: "checkpassenvironmenttwofactor"
+        privacy: "checkpassprivacybasic"
+        fees: "checkgoodfeecontrolfull"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkfailprivacydisclosurecentralized"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
-  android:
-    text: "walletelectrum"
-    link: "https://play.google.com/store/apps/details?id=org.electrum.electrum"
-    source: "https://github.com/spesmilo/electrum"
-    screenshot: "electrumandroid.png"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
+  - mobile:
+    name: mobile
     os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletelectrum"
+        link: "https://play.google.com/store/apps/details?id=org.electrum.electrum"
+        source: "https://github.com/spesmilo/electrum"
+        screenshot: "electrumandroid.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvservers"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
 ---
diff --git a/_wallets/greenaddress.md b/_wallets/greenaddress.md
index 867db7a4..4d30dc60 100644
--- a/_wallets/greenaddress.md
+++ b/_wallets/greenaddress.md
@@ -5,98 +5,83 @@ titleshort: "Green<br>Address"
 compat: "mobile desktop web android ios windows mac linux"
 level: 3
 platform:
-  mobile:
-    text: "walletgreenaddress"
-    link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova"
-    source: "https://github.com/greenaddress/WalletCordova"
-    screenshot: "greenaddressandroid.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    - ios
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkpassvalidationservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  desktop:
-    text: "walletgreenaddress"
-    link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp"
-    source: "https://github.com/greenaddress/WalletCrx"
-    screenshot: "greenaddressdesktop.png"
+      - name: ios
+        text: "walletgreenaddress"
+        link: "https://itunes.apple.com/app/id1206035886"
+        source: "https://github.com/greenaddress/WalletCordova"
+        screenshot: "greenaddressandroid.png"
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkpassvalidationservers"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletgreenaddress"
+        link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova"
+        source: "https://github.com/greenaddress/WalletCordova"
+        screenshot: "greenaddressandroid.png"
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkpassvalidationservers"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletgreenaddress"
+      link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp"
+      source: "https://github.com/greenaddress/WalletCrx"
+      screenshot: "greenaddressdesktop.png"
+      check:
+        control: "checkpasscontrolmulti"
+        validation: "checkfailvalidationcentralized"
+        transparency: "checkfailtransparencyremote"
+        environment: "checkpassenvironmenttwofactor"
+        privacy: "checkpassprivacybasic"
+        fees: "checkgoodfeecontrolfull"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkfailprivacydisclosureaccount"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
-  web:
-    text: "walletgreenaddress"
-    link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp"
-    source: "https://github.com/greenaddress/WalletCrx"
-    screenshot: "greenaddressdesktop.png"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
+  - web:
+    name: web
     os:
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
-  ios:
-    text: "walletgreenaddress"
-    link: "https://itunes.apple.com/app/id1206035886"
-    source: "https://github.com/greenaddress/WalletCordova"
-    screenshot: "greenaddressandroid.png"
-    os:
-    - android
-    - ios
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkpassvalidationservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletgreenaddress"
-    link: "https://play.google.com/store/apps/details?id=it.greenaddress.cordova"
-    source: "https://github.com/greenaddress/WalletCordova"
-    screenshot: "greenaddressandroid.png"
-    os:
-    - android
-    - ios
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkpassvalidationservers"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: web
+        text: "walletgreenaddress"
+        link: "https://chrome.google.com/webstore/detail/greenaddressit/dgbimgjoijjemhdamicmljbncacfndmp"
+        source: "https://github.com/greenaddress/WalletCrx"
+        screenshot: "greenaddressdesktop.png"
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencyremote"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/greenbits.md b/_wallets/greenbits.md
index 5ed7c991..fa05046f 100644
--- a/_wallets/greenbits.md
+++ b/_wallets/greenbits.md
@@ -5,22 +5,23 @@ titleshort: "GreenBits"
 compat: "mobile android"
 level: 2
 platform:
-  mobile:
-    text: "walletgreenbits"
-    link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet"
-    source: "https://github.com/greenaddress/GreenBits"
-    screenshot: "greenbits.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    check:
-      control: "checkpasscontrolmulti"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmenttwofactor"
-      privacy: "checkpassprivacybasic"
-      fees: "checkgoodfeecontrolfull"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: android
+        text: "walletgreenbits"
+        link: "https://play.google.com/store/apps/details?id=com.greenaddress.greenbits_android_wallet"
+        source: "https://github.com/greenaddress/GreenBits"
+        screenshot: "greenbits.png"
+        check:
+          control: "checkpasscontrolmulti"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmenttwofactor"
+          privacy: "checkpassprivacybasic"
+          fees: "checkgoodfeecontrolfull"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/keepkey.md b/_wallets/keepkey.md
index 8545fab0..c64985d7 100644
--- a/_wallets/keepkey.md
+++ b/_wallets/keepkey.md
@@ -5,16 +5,19 @@ titleshort: "KeepKey"
 compat: "hardware"
 level: 2
 platform:
-  hardware:
-    text: "walletkeepkey"
-    link: "https://www.keepkey.com/"
-    source: "https://github.com/keepkey/"
-    screenshot: "keepkey.png"
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkneutralvalidationvariable"
-      transparency: "checkfailtransparencynew"
-      environment: "checkgoodenvironmenthardware"
-      privacy: "checkneutralprivacyvariable"
-      fees: "checkneutralfeecontrolvariable"
+  - hardware:
+    name: hardware
+    os:
+      - name: hardware
+        text: "walletkeepkey"
+        link: "https://www.keepkey.com/"
+        source: "https://github.com/keepkey/"
+        screenshot: "keepkey.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkneutralvalidationvariable"
+          transparency: "checkfailtransparencynew"
+          environment: "checkgoodenvironmenthardware"
+          privacy: "checkneutralprivacyvariable"
+          fees: "checkneutralfeecontrolvariable"
 ---
diff --git a/_wallets/ledgernano.md b/_wallets/ledgernano.md
index df96f0e8..0ddd5409 100644
--- a/_wallets/ledgernano.md
+++ b/_wallets/ledgernano.md
@@ -5,16 +5,19 @@ titleshort: "Ledger<br>Nano"
 compat: "hardware"
 level: 2
 platform:
-  hardware:
-    text: "walletnano"
-    link: "https://www.ledgerwallet.com/"
-    source: "https://github.com/LedgerHQ/"
-    screenshot: "ledger.png"
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkneutralvalidationvariable"
-      transparency: "checkfailtransparencynew"
-      environment: "checkgoodenvironmenthardware"
-      privacy: "checkneutralprivacyvariable"
-      fees: "checkneutralfeecontrolvariable"
+  - hardware:
+    name: hardware
+    os:
+      - name: hardware
+        text: "walletnano"
+        link: "https://www.ledgerwallet.com/"
+        source: "https://github.com/LedgerHQ/"
+        screenshot: "ledger.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkneutralvalidationvariable"
+          transparency: "checkfailtransparencynew"
+          environment: "checkgoodenvironmenthardware"
+          privacy: "checkneutralprivacyvariable"
+          fees: "checkneutralfeecontrolvariable"
 ---
diff --git a/_wallets/ledgernanos.md b/_wallets/ledgernanos.md
index 59bccbb4..c073f421 100644
--- a/_wallets/ledgernanos.md
+++ b/_wallets/ledgernanos.md
@@ -5,16 +5,19 @@ titleshort: "Ledger<br>Nano S"
 compat: "hardware"
 level: 2
 platform:
-  hardware:
-    text: "walletnanos"
-    link: "https://www.ledgerwallet.com/"
-    source: "https://github.com/LedgerHQ/"
-    screenshot: "ledgernanos.png"
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkneutralvalidationvariable"
-      transparency: "checkfailtransparencynew"
-      environment: "checkgoodenvironmenthardware"
-      privacy: "checkneutralprivacyvariable"
-      fees: "checkneutralfeecontrolvariable"
+  - hardware:
+    name: hardware
+    os:
+      - name: hardware
+        text: "walletnanos"
+        link: "https://www.ledgerwallet.com/"
+        source: "https://github.com/LedgerHQ/"
+        screenshot: "ledgernanos.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkneutralvalidationvariable"
+          transparency: "checkfailtransparencynew"
+          environment: "checkgoodenvironmenthardware"
+          privacy: "checkneutralprivacyvariable"
+          fees: "checkneutralfeecontrolvariable"
 ---
diff --git a/_wallets/msigna.md b/_wallets/msigna.md
index aeca2f82..6a8df842 100644
--- a/_wallets/msigna.md
+++ b/_wallets/msigna.md
@@ -5,24 +5,29 @@ titleshort: "mSIGNA"
 compat: "desktop windows mac linux"
 level: 2
 platform:
-  desktop:
-    text: "walletmsigna"
-    link: "https://ciphrex.com/redirect/?referer=bitcoin.org"
-    source: "https://ciphrex.com/redirect/?url=https://github.com/ciphrex/CoinVault?referer=bitcoin.org"
-    screenshot: "msigna.png"
+  - desktop:
+    name: desktop
+    default: &DEFAULT
+      text: "walletmsigna"
+      link: "https://ciphrex.com/redirect/?referer=bitcoin.org"
+      source: "https://ciphrex.com/redirect/?url=https://github.com/ciphrex/CoinVault?referer=bitcoin.org"
+      screenshot: "msigna.png"
+      check:
+        control: "checkgoodcontrolfull"
+        validation: "checkgoodvalidationfullnoderequired"
+        transparency: "checkpasstransparencyopensource"
+        environment: "checkfailenvironmentdesktop"
+        privacy: "checkgoodprivacyimproved"
+        fees: "checkfailfeecontrolstatic"
+      privacycheck:
+        privacyaddressreuse: "checkpassprivacyaddressrotation"
+        privacydisclosure: "checkpassprivacydisclosurefullnode"
+        privacynetwork: "checkpassprivacynetworksupporttorproxy"
     os:
-    - windows
-    - mac
-    - linux
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkgoodvalidationfullnoderequired"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkgoodprivacyimproved"
-      fees: "checkfailfeecontrolstatic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkpassprivacydisclosurefullnode"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: windows
+        <<: *DEFAULT
+      - name: mac
+        <<: *DEFAULT
+      - name: linux
+        <<: *DEFAULT
 ---
diff --git a/_wallets/mycelium.md b/_wallets/mycelium.md
index 460c8bc5..7222b48d 100644
--- a/_wallets/mycelium.md
+++ b/_wallets/mycelium.md
@@ -5,22 +5,23 @@ titleshort: "Mycelium"
 compat: "mobile android"
 level: 3
 platform:
-  mobile:
-    text: "walletmyceliumwallet"
-    link: "https://play.google.com/store/apps/details?id=com.mycelium.wallet"
-    source: "https://github.com/mycelium-com/wallet"
-    screenshot: "mycelium.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurecentralized"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: android
+        text: "walletmyceliumwallet"
+        link: "https://play.google.com/store/apps/details?id=com.mycelium.wallet"
+        source: "https://github.com/mycelium-com/wallet"
+        screenshot: "mycelium.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurecentralized"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---
diff --git a/_wallets/simplebitcoinwallet.md b/_wallets/simplebitcoinwallet.md
index 459255a3..91d259ea 100644
--- a/_wallets/simplebitcoinwallet.md
+++ b/_wallets/simplebitcoinwallet.md
@@ -5,40 +5,23 @@ titleshort: "Simple<br>Bitcoin"
 compat: "mobile android"
 level: 2
 platform:
-  mobile:
-    text: "walletsimplebitcoinwallet"
-    link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet"
-    source: "https://github.com/btcontract/wallet"
-    screenshot: "simplebitcoinwalletandroid.png"
+  - mobile:
+    name: mobile
     os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
-  android:
-    text: "walletsimplebitcoinwallet"
-    link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet"
-    source: "https://github.com/btcontract/wallet"
-    screenshot: "simplebitcoinwalletandroid.png"
-    os:
-    - android
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkpassvalidationspvp2p"
-      transparency: "checkpasstransparencyopensource"
-      environment: "checkpassenvironmentmobile"
-      privacy: "checkpassprivacybasic"
-      fees: "checkpassfeecontroldynamic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosurespv"
-      privacynetwork: "checkfailprivacynetworknosupporttor"
+      - name: android
+        text: "walletsimplebitcoinwallet"
+        link: "https://play.google.com/store/apps/details?id=com.btcontract.wallet"
+        source: "https://github.com/btcontract/wallet"
+        screenshot: "simplebitcoinwalletandroid.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkpassvalidationspvp2p"
+          transparency: "checkpasstransparencyopensource"
+          environment: "checkpassenvironmentmobile"
+          privacy: "checkpassprivacybasic"
+          fees: "checkpassfeecontroldynamic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosurespv"
+          privacynetwork: "checkfailprivacynetworknosupporttor"
 ---
diff --git a/_wallets/trezor.md b/_wallets/trezor.md
index 33405280..cd7a29b1 100644
--- a/_wallets/trezor.md
+++ b/_wallets/trezor.md
@@ -5,16 +5,19 @@ titleshort: "Trezor"
 compat: "hardware"
 level: 2
 platform:
-  hardware:
-    text: "wallettrezor"
-    link: "https://trezor.io/"
-    source: "https://github.com/trezor/"
-    screenshot: "trezor.png"
-    check:
-      control: "checkgoodcontrolfull"
-      validation: "checkneutralvalidationvariable"
-      transparency: "checkgoodtransparencydeterministic"
-      environment: "checkgoodenvironmenthardware"
-      privacy: "checkneutralprivacyvariable"
-      fees: "checkneutralfeecontrolvariable"
+  - hardware:
+    name: hardware
+    os:
+      - name: hardware
+        text: "wallettrezor"
+        link: "https://trezor.io/"
+        source: "https://github.com/trezor/"
+        screenshot: "trezor.png"
+        check:
+          control: "checkgoodcontrolfull"
+          validation: "checkneutralvalidationvariable"
+          transparency: "checkgoodtransparencydeterministic"
+          environment: "checkgoodenvironmenthardware"
+          privacy: "checkneutralprivacyvariable"
+          fees: "checkneutralfeecontrolvariable"
 ---
diff --git a/_wallets/xapo.md b/_wallets/xapo.md
index 8af22a3b..38dba86b 100644
--- a/_wallets/xapo.md
+++ b/_wallets/xapo.md
@@ -5,19 +5,21 @@ titleshort: "Xapo"
 compat: "web"
 level: 4
 platform:
-  web:
-    text: "walletxapo"
-    link: "https://xapo.com/"
-    screenshot: "xapo.png"
+  - web:
+    name: web
     os:
-    check:
-      control: "checkfailcontrolthirdpartyinsured"
-      validation: "checkfailvalidationcentralized"
-      transparency: "checkfailtransparencyremote"
-      environment: "checkfailenvironmentdesktop"
-      privacy: "checkpassprivacybasic"
-    privacycheck:
-      privacyaddressreuse: "checkpassprivacyaddressrotation"
-      privacydisclosure: "checkfailprivacydisclosureaccount"
-      privacynetwork: "checkpassprivacynetworksupporttorproxy"
+      - name: web
+        text: "walletxapo"
+        link: "https://xapo.com/"
+        screenshot: "xapo.png"
+        check:
+          control: "checkfailcontrolthirdpartyinsured"
+          validation: "checkfailvalidationcentralized"
+          transparency: "checkfailtransparencyremote"
+          environment: "checkfailenvironmentdesktop"
+          privacy: "checkpassprivacybasic"
+        privacycheck:
+          privacyaddressreuse: "checkpassprivacyaddressrotation"
+          privacydisclosure: "checkfailprivacydisclosureaccount"
+          privacynetwork: "checkpassprivacynetworksupporttorproxy"
 ---