Merge remote-tracking branch 'upstream/master'

merge for contact us link

_data/wallets-collection.yml

@@ -1,17 +1,17 @@
 - name: "Dash Core Win/64 Installer"
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: win64
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_id: dash_core_win_64_install
   product_label: Dash Core
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Dash.org
   product_website_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -25,19 +25,19 @@
       url: "/binaries/dash-0.12.1.0-win64-setup.exe.asc"
 
 - name: Dash Core Win/64 ZIP
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: win64
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_id: dash_core_win_64_zip
   product_label: Dash Core
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Dash.org
   product_website_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -51,19 +51,19 @@
       url: "/binaries/dash-0.12.1.0-win64.zip.asc"
 
 - name: "Dash Core Win/32 Installer"
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: win32
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_id: dash_core_win_32_install
   product_label: Dash Core
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Dash.org
   product_website_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -77,19 +77,19 @@
       url: "/binaries/dash-0.12.1.0-win32-setup.exe.asc"
 
 - name: "Dash Core Win/32 ZIP"
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: win32
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_id: dash_core_win_32_zip
   product_label: Dash Core Win/32 ZIP
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Dash.org
   product_website_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -103,7 +103,7 @@
       url: "/binaries/dash-0.12.1.0-win32.zip.asc"
 
 - name: Dash Core Linux 32 Bit
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: linux
   type: desktop
@@ -111,11 +111,13 @@
   vendor_label: Dash Core
   product_id: dash_core_linux_32
   product_label: Dash Core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_security_label: "https://www.dash.org"
   product_security_url: "https://www.dash.org"
   product_website_label: Dash.org
   product_website_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -129,19 +131,19 @@
       url: "/binaries/dash-0.12.1.0-linux32.tar.gz.asc"
 
 - name: Dash Core Linux 64 Bit
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: linux
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_id: dash_core_linux_64
   product_label: Dash Core
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Dash.org
   product_website_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -155,7 +157,7 @@
       url: "/binaries/dash-0.12.1.0-linux64.tar.gz.asc"
 
 - name: Dash Core Raspberry Pi 2
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: linux
   type: desktop
@@ -163,11 +165,11 @@
   vendor_label: Dash Core
   product_id: dash_core_linux_64
   product_label: Dash Core
-  product_security_label: "https://www.dash.org"
+  control_type: full
-  product_security_url: "https://www.dash.org"
+  validation_type: full
+  access_type: p2p
   product_website_label: Dash.org
   product_website_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -181,19 +183,19 @@
       url: "/binaries/dash-0.12.1.0-RPi2.tar.gz.asc"
 
 - name: Dash Electrum 32/64bit
-  description: Dash Core "Light" Wallet (No Features)
+  description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
   logo_url: /assets/img/wallets/electrum_banner.png
   os: linux
   type: desktop
   vendor_id: electrum
   vendor_label: Electrum
+  control_type: full
+  validation_type: spv
+  access_type: multi
   product_id: dash_electrum
   product_label: Dash Electrum
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Electrum-Dash.org
   product_website_url: "https://electrum-dash.org/"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/electrum-dash"
   links:
     -
@@ -207,19 +209,19 @@
       url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc"
 
 - name: Dash Electrum 32/64bit
-  description: Dash Core "Light" Wallet (No Features)
+  description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
   logo_url: /assets/img/wallets/electrum_banner.png
   os: win32
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: spv
+  access_type: multi
   product_id: dash_electrum
   product_label: Dash Electrum
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Electrum-Dash.org
   product_website_url: "https://electrum-dash.org/"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/electrum-dash"
   links:
     -
@@ -233,19 +235,19 @@
       url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
 
 - name: Dash Electrum 32/64bit
-  description: Dash Core "Light" Wallet (No Features)
+  description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
   logo_url: /assets/img/wallets/electrum_banner.png
   os: win64
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: spv
+  access_type: multi
   product_id: dash_electrum
   product_label: Dash Electrum
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_website_label: Electrum-Dash.org
   product_website_url: "https://electrum-dash.org/"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/electrum-dash"
   links:
     -
@@ -266,11 +268,11 @@
   type: desktop
   vendor_id: jaxx
   vendor_label: Jaxx
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: jaxx
   product_label: Jaxx
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://jaxx.io/support.html"
   links:
     -
@@ -285,11 +287,11 @@
   type: desktop
   vendor_id: jaxx
   vendor_label: Jaxx
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: jaxx
   product_label: Jaxx
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://jaxx.io/support.html"
   links:
     -
@@ -304,11 +306,11 @@
   type: desktop
   vendor_id: jaxx
   vendor_label: Jaxx
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: jaxx
   product_label: Jaxx
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://jaxx.io/support.html"
   links:
     -
@@ -316,17 +318,17 @@
       url: "https://jaxx.io/support.html"
 
 - name: Dash Core
-  description: Dash Core QT Wallet (All Features incl IS, PS, ....)
+  description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
   logo_url: /assets/img/dash_circle_normal.png
   os: osx
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
   product_id: dash_core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_label: Dash Core
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/dash"
   links:
     -
@@ -340,17 +342,17 @@
       url: "/binaries/dash-0.12.1.0-osx.dmg.asc"
 
 - name: Dash Electrum
-  description: Dash Core "Light" Wallet (No Features incl IS, PS, ....)
+  description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
   logo_url: /assets/img/wallets/electrum_banner.png
   os: osx
   type: desktop
   vendor_id: dash_core
   vendor_label: Dash Core
+  control_type: full
+  validation_type: full
+  access_type: p2p
   product_id: dash_electrum
   product_label: Dash Electrum
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/electrum-dash"
   links:
     -
@@ -371,11 +373,11 @@
   type: desktop
   vendor_id: jaxx
   vendor_label: Jaxx
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: jaxx
   product_label: Jaxx
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://jaxx.io/support.html"
   links:
     -
@@ -401,11 +403,11 @@
   type: mobile
   vendor_id: hash_engineering_solutions
   vendor_label: Hash Engineering Solutions
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: dash_android_wallet
   product_label: Dash Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/HashEngineering/dash-wallet"
   links:
     -
@@ -425,16 +427,16 @@
       Hierarchical Deterministic Wallet (BIP44) enables you to keep everything accessible and secure with just one super-passphrase which you only have to back-up once and for all.
     • Open Source & Transparent
       No hidden code, no malicious modules, no exploits, no small letters. Our code is publicly available and publicly reviewed.
-  logo_url: "/assets/img/wallets/coinomi.ico"
+  logo_url: "/assets/img/wallets/coinomi-logo-medium.png"
   os: android
   type: mobile
   vendor_id: coinomi
   vendor_label: Coinomi
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: coinomi_wallet
   product_label: Coinomi Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/Coinomi/coinomi-android"
   links:
     -
@@ -455,10 +457,11 @@
   type: mobile
   vendor_id: jaxx
   vendor_label: Jaxx
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: jaxx
   product_label: Jaxx Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
   product_source_label: Github
   product_source_url: "https://jaxx.io/support.html"
   links:
@@ -468,20 +471,22 @@
 
 - name: Exodus
   description: Exodus is the first desktop multi-asset wallet with ShapeShift built in. Exodus encrypts private keys and transaction data locally for your eyes only - no accounts, no servers, no data sharing. Track the value of your blockchain asset portfolio, in real time, as market conditions change.
-  logo_url: "https://www.exodus.io/favicon.ico"
+  logo_url: "/assets/img/wallets/exodus.png"
   os: win64
   type: desktop
   vendor_id: exodus
   vendor_label: Exodus
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: exodus
   product_label: Exodus Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Not Open Source
-  product_source_url:
   links:
     -
-      label: Download Options
+      label: Exodus Downloads
       url: "https://www.exodus.io/releases/"
 
 - name: Exodus
@@ -491,46 +496,40 @@
   type: desktop
   vendor_id: exodus
   vendor_label: Exodus
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: exodus
   product_label: Exodus Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Not Open Source
-  product_source_url:
   links:
     -
-      label: Download Options
+      label: Exodus Downloads
       url: "https://www.exodus.io/releases/"
 
 - name: Exodus
   description: Exodus is the first desktop multi-asset wallet with ShapeShift built in. Exodus encrypts private keys and transaction data locally for your eyes only - no accounts, no servers, no data sharing. Track the value of your blockchain asset portfolio, in real time, as market conditions change.
-  logo_url: "https://www.exodus.io/favicon.ico"
+  logo_url: "/assets/img/wallets/exodus.png"
   os: linux
   type: desktop
   vendor_id: exodus
   vendor_label: Exodus
+  control_type: semi
+  validation_type: hosted
+  access_type: vendor
   product_id: exodus
   product_label: Exodus Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Not Open Source
-  product_source_url:
   links:
     -
-      label: Download Options
+      label: Exodus Downloads
       url: "https://www.exodus.io/releases/"
 - name: Dash Core Paper Wallet
   description: Paper wallets are a form of cold wallet and essentially a bearer instrument – whoever holds them has access to both the Dash private key and therefore the address.
   logo_url: /assets/img/dash_circle_normal.png
-  os:
   type: paper
   vendor_id: dash_core
   vendor_label: Dash Core
   product_id: dash_paper
   product_label: Dash Core Paper Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/dashpay/paper.dash.org"
   links:
     -
@@ -540,15 +539,11 @@
 - name: KeepKey Hardware Wallet
   description: KeepKey is a hardware wallet that secures Dash (and other cryptocurrencies). Your assets are protected from hackers and thieves. KeepKey works with the wallet software on your computer by taking over the management of private key generation, private key storage, and transaction signing.
   logo_url: "https://avatars3.githubusercontent.com/u/73358?v=3&s=400"
-  os:
   type: hardware
   vendor_id: keepkey
   vendor_label: KeepKey
   product_id: keepkey
   product_label: KeepKey Hardware Wallet
-  product_security_label: "https://www.keepkey.com"
-  product_security_url: "https://www.keepkey.com"
-  product_source_label: Github
   product_source_url: "https://github.com/dstanchfield/trezor-mcu/commits/master"
   links:
     -
@@ -558,15 +553,11 @@
 - name: Ledger Nano S
   description: Ledger Nano S is a Dash (Bitcoin, Ethereum and Altcoins) hardware wallet, based on robust safety features for storing cryptographic assets and securing digital payments. It connects to any computer (USB) and embeds a secure OLED display to double-check and confirm each transaction with a single tap on its side buttons.
   logo_url: /assets/img/wallets/ledger-nano-s-fold-medium.png
-  os:
   type: hardware
   vendor_id: ledger
   vendor_label: Ledger
   product_id: ledger_nano_s
   product_label: Ledger Nano S
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/LedgerHQ/ledger-nano-s"
   links:
     -
@@ -576,15 +567,11 @@
 - name: Trezor
   description: TREZOR is a hardware wallet providing advanced security for handling bitcoin private keys. Unlike traditional cold storage methods (offline storage or paper wallet), TREZOR is able to make secure payments without exposing your private keys to a potentially compromised computer
   logo_url: "/assets/img/wallets/trezor-logo.png"
-  os:
   type: hardware
   vendor_id: trezor
   vendor_label: Trezor
   product_id: trezor
   product_label: Trezor Hardware Wallet
-  product_security_label: "https://www.dash.org"
-  product_security_url: "https://www.dash.org"
-  product_source_label: Github
   product_source_url: "https://github.com/trezor"
   links:
     -

_i18n/en.yml

@@ -237,6 +237,7 @@ pages:
     hero-wallets-btn: Wallets
     hero-guide-btn: Guide
     hero-security-btn: Security
+    hero-text: Your wallet is the software you use to send, receive and store Dash. It’s simple to use and you can choose to send payments anonymously from your wallet using PrivateSend
     wallets-desktop-header: Desktop
     wallets-desktop-subtitle: Dash Desktop Wallets are available with different features and security.
     wallets-mobile-header: Mobile
@@ -246,13 +247,32 @@ pages:
     wallets-paper-header: Paper
     wallets-paper-subtitle: Paper wallets are a form of cold wallet and essentially a bearer instrument.
     wallets-security-header: Security
-    wallets-security-subtitle: Please secure your wallets by protecting them with difficult-to-guess passwords and by backing them up in a secure place. If your funds are lost or stolen, there is no way to recover them! If using a hardware and online Wallets, please secure your "seeds" just as you would a regular wallet password. They are the only way to recover your wallet. (Very helpful apps for Password/Seed security are <http://keepass.info> and others)
+    modal-platform: Platform
+
+    wallets-security-subtitle: Please secure your wallets by protecting them with strong, difficult-to-guess passwords and by backing them up in a secure place. If your funds are lost or stolen, there is no way to recover them without a backup. If using a hardware and online Wallets, please secure your "seeds" just as you would a regular wallet password. They are the only way to recover your wallet. (Very helpful apps for Password/Seed security are <http://keepass.info> and others)
     modal-header-vendor-label-descriptor: Wallet for Dash
     modal-download-action-button-label: Download
-    modal-security-label: Security
+    modal-source-code-view: View
     modal-source-code-label: Source Code
+    modal-source-closed-label: Proprietary
     modal-website-label: Website
 
+
+    modal-control-label: Control
+    modal-control-full: This wallet provides full control of your Dash, and you can verify the source code and binaries yourself.
+    modal-control-semi: This wallet provides full control of your Dash, but you have to trust that your download doesn't contain malicious code
+
+    modal-validation-label: Validation
+    modal-validation-full: Full verification without needing to trust if payments were sent or received. This is the most secure wallet but uses the most diskspace.
+    modal-validation-spv: Simplified verification meaning you can validate if payments were sent or received with minimal trust.
+    modal-validation-hosted: You need to trust the vendor's server to know if payments were sent or received.
+
+    modal-access-label: Access
+    modal-access-p2p: Provides direct access to the p2p network.  This is the most censorship free and decentralized access.
+    modal-access-multi: Your access to the Dash p2p network is through a single intermediary gateway, but you can choose the gateway you want to use.
+    modal-access-vendor: Your access to the Dash p2p network is via proxy using only the vendor's servers.
+
+    modal-core-minimum-reqs: Minimum required versions
     modal-core-header: Download Dash Core
     modal-electrum-header: Download Dash Electrum
     modal-win-core-description: Brief Description&#58 Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt
@@ -261,11 +281,11 @@ pages:
     modal-win-core-source-code-key: Source Code
     modal-win-core-source-code-value: .&#40link/ closed source&#41
     modal-core-users-text: General Users
-    modal-core-users-value: 0.12.0.58
+    modal-core-users-value: 0.12.1.0
     modal-core-masternode-text: Masternode Operators
-    modal-core-masternode-value: 0.12.0.58
+    modal-core-masternode-value: 0.12.1.0
     modal-core-pool-text: Pool Operators
-    modal-core-pool-value: 0.12.0.58
+    modal-core-pool-value: 0.12.1.0
 
 
   contact:

_i18n/ru.yml

@@ -124,6 +124,9 @@ pages:
     need-link: https://www.dash.org/forum/topic/Русский-russian.27/
     need-input: Введите ваш Email адрес
 
+  wallets:
+    hero-text: Кошелёк — это программа, с помощью которой вы можете получать, хранить и отправлять ваши средства Dash. Он прост в использовании и позволяет задействовать встроенную функцию анонимизации PrivateSend
+
   merchants:
     title: Оплачивайте в Dash
     description: Оплачивайте товары и услуги с помощью Dash

_includes/hero/wallets.html

@@ -20,6 +20,7 @@
 	<!-- Hero content -->
 	<div class="hero__content">
 		<h1 class="hero__title">{% t pages.wallets.hero-heading %}</h1>
+		<p class="hero__lead">{% t pages.wallets.hero-text %}</p>
 
 		<div class="hero__buttons">
 			<a href="#wallets" class="btn-white-solid">{% t pages.wallets.hero-wallets-btn %}</a>

_includes/modals/vendor-group-download-collection.html

@@ -1,7 +1,6 @@
 <!-- Modal -->
 {% for wallet in vendor-group.items %}
 <div id="{{wallet.os}}-{{wallet.vendor_id}}-{{wallet.type_id}}-{{wallet.product_id}}-modal"
-
 	 {% if wallet.vendor_id == 'dash_core' %}
 		class="modal fade wallet-modal-container dash-core"
 	{% else %}
@@ -18,6 +17,13 @@
                 <div class="row">
                     <div class="col-md-4 col-md-push-8 col-xs-12 text-left b-modal__sidebar">
 						{% if wallet.vendor_id == 'dash_core' %}
+							<div class="row">
+								<div class="col-xs-12">
+									<div class="b-modal__accent bottom-space">
+										<h5>{% t pages.wallets.modal-core-minimum-reqs %}:</h5>
+									</div>
+								</div>
+							</div>
 			                <div class="row">
 			                  <div class="col-xs-12">
 			                    <div class="b-modal__accent bottom-space">
@@ -53,33 +59,88 @@
 
                     <div class="col-md-8 col-md-pull-4 col-xs-12">
                         <div>
-                            <p class="bottom-space b-modal__descr">{{wallet.description}}</p>
+							<h5 class="bottom-space">
+								<p class="bottom-space b-modal__accent">
+									{% t pages.wallets.modal-platform%}:
 
-                            <h5 class="bottom-space">
+									{% if wallet.type == "desktop" %}
-                                <span class="b-modal__accent">
+										{% t pages.wallets.wallets-desktop-header %}
-                                    {% t pages.wallets.modal-security-label %}: &nbsp;
+									{% elsif wallet.type == "mobile" %}
-                                </span>
+										{% t pages.wallets.wallets-mobile-header %}
-                                <a href="{{wallet.product_security_url}}" target="_blank">{{wallet.product_security_label}}</a>
+									{% elsif wallet.type == "hardware" %}
-                            </h5>
+										{% t pages.wallets.wallets-hardware-header %}
+									{% elsif wallet.type == "paper" %}
+										{% t pages.wallets.wallets-paper-header %}
+									{% endif %}
+								</p>
+							</h5>
 
+							{% if wallet.type == "hardware" || wallet.type == "paper" %}
+								<p class="bottom-space b-modal__descr">{{wallet.description}}</p>
+							{% else %}
+
+								{% if wallet.control_type %}
+								<h5 class="bottom-space">
+									<p class="bottom-space b-modal__accent">
+										{% t pages.wallets.modal-control-label %}:
+
+										{% if wallet.control_type == "full" %}
+											{% t pages.wallets.modal-control-full %}
+										{% elsif wallet.control_type == "semi" %}
+											{% t pages.wallets.modal-control-semi %}
+										{% endif %}
+									</p>
+								</h5>
+								{% endif %}
+
+								{% if wallet.validation_type %}
+								<h5 class="bottom-space">
+									<p class="bottom-space b-modal__accent">
+										{% t pages.wallets.modal-validation-label %}:
+
+										{% if wallet.validation_type == "full" %}
+											{% t pages.wallets.modal-validation-full %}
+										{% elsif wallet.validation_type == "spv" %}
+											{% t pages.wallets.modal-validation-spv %}
+										{% elsif wallet.validation_type == "hosted" %}
+											{% t pages.wallets.modal-validation-hosted %}
+										{% endif %}
+									</p>
+								</h5>
+								{% endif %}
+
+								{% if wallet.control_type %}
+								<h5 class="bottom-space">
+									<p class="bottom-space b-modal__accent">
+										{% t pages.wallets.modal-access-label %}:
+
+										{% if wallet.access_type == "p2p" %}
+											{% t pages.wallets.modal-access-p2p %}
+										{% elsif wallet.access_type == "multi" %}
+											{% t pages.wallets.modal-access-multi %}
+										{% elsif wallet.access_type == "vendor" %}
+											{% t pages.wallets.modal-access-vendor %}
+										{% endif %}
+									</p>
+								</h5>
+								{% endif %}
+							{% endif %}
 
                             <h5 class="bottom-space">
                                 <span class="b-modal__accent">
                                     {% t pages.wallets.modal-source-code-label %}: &nbsp;
+									{% if wallet.product_source_url %}
+										<a href="{{wallet.product_source_url}}" target="_blank">{% t pages.wallets.modal-source-code-view%}</a>
+									{% else %}
+										{% t pages.wallets.modal-source-closed-label %}
+									{% endif %}
                                 </span>
-                                <a href="{{wallet.product_source_url}}" target="_blank">{{wallet.product_source_label}}</a>
                             </h5>
 
-                            <h5 class="bottom-space b-modal__accent">
-                                <span>
-                                    {% t pages.wallets.modal-website-label %}: &nbsp;
-                                </span>
-                                <a href="{{wallet.product_website_url}}" target="_blank">{{wallet.product_website_label}}</a>
-                            </h5>
                         </div>
                         <div>
                             <button type="button" class="btn btn-default" data-dismiss="modal" aria-label="{{wallet.links[0].label}}" data-url="{{wallet.links[0].url}}" ><span
-                                    aria-hidden="true">{{wallet.links[0].label}}: {{wallet.name}}</span></button>
+                                    aria-hidden="true">{{wallet.links[0].label}}</span></button>
                         </div>
                     </div>
                 </div>

src/scss/_junk-drawer.scss

@@ -236,13 +236,13 @@ a.blog_link {
     .dash-core & {
       color: #fff;
     }
-    font-size: 1.2em;
+    font-size: 0.9em;
   }
   &__accent {
     .dash-core & {
       color: #fff;
     }
-    font-size: 0.9em;
+    font-size: 0.8em;
   }
   &__sidebar {
     padding: 3px 15px 0 42px;

wallets/index.html

@@ -22,6 +22,19 @@ description: pages.wallets.description
 {% endfor %}
 
 <div class="page page--wallets">
+
+	<section class="section clearfix">
+		<div class="section__content">
+			<h3>{% t pages.wallets.wallets-security-header %}</h3>
+			<p>{% t pages.wallets.wallets-security-subtitle %}</p>
+			<div class="row">
+				{% for wallet in security-wallets %}
+				{% include wallet-tile.html %}
+				{% endfor %}
+			</div>
+		</div>
+	</section>
+
   <section class="section">
     <div class="section__content">
       <h3 id="wallets">{% t pages.wallets.wallets-desktop-header %}</h3>
@@ -112,16 +125,4 @@ description: pages.wallets.description
     </div>
   </section>
 
-  <section class="section clearfix">
-    <div class="section__content">
-      <h3>{% t pages.wallets.wallets-security-header %}</h3>
-      <p>{% t pages.wallets.wallets-security-subtitle %}</p>
-      <div class="row">
-        {% for wallet in security-wallets %}
-        {% include wallet-tile.html %}
-        {% endfor %}
-      </div>
-    </div>
-  </section>
-
 </div>