Home / Blog / Team / Merchant TOS page updates (#34)

* Update: Merchant page and images

* Update: Blog hero image

* Update: Team hero image / content

* Update: Blog content and images

* Update: Start-page copy, images and featured merchants / blog posts

* Update: Add remaining merchants / images (requires styling)

* Update: Footer

* Add: Terms of use page and translations

_data/merchants-cards.yml

@@ -2,8 +2,24 @@
 - name: ShakePay
   title: Debit Card
   url: https://shakepay.co
+  image: shakepay_logo.png
 
 - name: SpectroCoin
-  title: Quality Assurance, Automation, Testing
+  title: Debit Card
   url: https://spectrocoin.com/
+  image: SpectroCoin.jpg
 
+- name: UQUID
+  title: Debit Card
+  url: https://uquid.com/dash-debit-card
+  image: UQUID.jpg
+
+- name: Bitwala
+  title: Debit Card
+  url: https://my.bitwa.la
+  image: Bitwala.jpg
+
+- name: Wirex
+  title: Debit Card
+  url: https://wirexapp.com
+  image: Wirex.jpg

_data/merchants-casinos.yml

@@ -0,0 +1,12 @@
+
+- name: DirectBet
+  url: www.DirectBet.eu/
+  image: DirectBet.jpg
+
+- name: FortuneJack
+  url: https://fortunejack.com/
+  image: FortuneJack.jpg
+
+- name: CryptoGames
+  url: www.crypto-games.net
+  image: CryptoGames.jpg

_data/merchants-design.yml

@@ -0,0 +1,8 @@
+
+- name: Ether Design
+  url: http://etherdesign.io
+  image: EtherDesign.jpg
+
+- name: ISFX Media
+  url: http://isfx.co.uk/
+  image: isfx.jpg

_data/merchants-email.yml

@@ -0,0 +1,8 @@
+
+- name: ProtonMail
+  url: https://www.protonmail.com
+  image: protonmail.png
+
+- name: ClawsMail
+  url: http://www.claws-mail.org
+  image: ClawsMail.jpg

_data/merchants-games.yml

@@ -0,0 +1,20 @@
+
+- name: Nestorgames
+  url: http://www.nestorgames.com/#shopextd
+  image: Nestorgames.jpg
+
+- name: Retro Towers
+  url: http://www.retrotowers.co.uk
+  image: RetroTowers.jpg
+
+- name: Key4Coin
+  url: https://key4co.in
+  image: key4coin_logo.png
+
+- name: Coin Wars
+  url: http://coinwars.rocketempires.com
+  image: CoinWars.jpg
+
+- name: FX-Lucky
+  url: http://www.fx-lucky.com
+  image: FXLucky.jpg

_data/merchants-gifts.yml

@@ -0,0 +1,16 @@
+
+- name: Crypto de Change
+  url: http://www.cryptodechange.com
+  image: CryptodeChange.jpg
+
+- name: PremiumGiftCards
+  url: https://premiumgiftcards.com
+  image: PremiumGiftCards.png
+
+- name: Gift Off
+  url: https://giftoff.com
+  image: GiftOff.jpg
+
+- name: Cryfter
+  url: http://cryfter.com
+  image: Cryfter.jpg

_data/merchants-hosting.yml

@@ -0,0 +1,13 @@
+
+- name: QHoster
+  url: http://www.qhoster.com
+  image: qhoster.png
+
+- name: FlokiNet
+  url: https://www.flokinet.is/en/
+  image: FlokiNet.jpg
+
+- name: OcculusOmega
+  title: (Tor service)
+  url: http://occuomegawqtkl6j.onion/
+  image: OcculusOmega.png

_data/merchants-metals.yml

@@ -3,14 +3,6 @@
   url: https://www.coaex.com
   image: coaex_logo.png
 
-- name: Amagi Metals
-  url: http://www.amagimetals.com
-
 - name: Bitgild
   url: http://www.bitgild.com
-
-- name: Micro Precious Metals
-  url: http://www.micropreciousmetals.cf
-
-
-
+  image: Bitgild.png

_data/merchants-stores.yml

@@ -1,5 +1,100 @@
 
-- name: ShakePay2
-  title: Debit Card
-  url: https://shakepay.co
+- name: Brave New Books
+  title: Books
+  url: http://bravenewbookstore.com
+  image: BraveNewBooks.jpg
 
+- name: Bitstickers
+  title: Stickers
+  url: http://bitstickers.net
+  image: BitStickers.jpg
+
+- name: Yipptee
+  title: T Shirts
+  url: http://www.yipptee.com
+  image: Yipptee.jpg
+
+- name: BitLasers
+  title: Lasers and Accessories
+  url: http://bitlasers.com
+  image: Bitlaser.jpg
+
+- name: DeMadera
+  title: Watches/Jewellery/Access
+  url: http://demadera.nl
+  image: DeMadera.jpg
+
+- name: PexPeppers
+  title: Hot Sauce
+  url: https://www.pexpeppers.com
+  image: PexPepper.jpg
+
+- name: Seymour Locksmith
+  title: Locksmith Service
+  url: http://seymour-locksmiths.co.uk/hove/
+  image: SeymourLocksmith.jpg
+
+- name: BitcoinSeedStore
+  title: Watches
+  url: http://www.bitcoinseedstore.com
+  image: BitcoinSeedStore.jpg
+
+- name: Misconduct Wine Company
+  title: Winery
+  url: http://www.misconductwineco.com
+  image: misconductwine_logo.jpg.jpg
+
+- name: Party Cakes4u
+  title: Cake Shop
+  url: http://www.partycakes4u.co.uk/
+  image: PartyCakesforYou.jpg
+
+- name: CryptoPet
+  title: Pets
+  url: http://cryptopet.com/
+  image: CryptoPet.jpg
+
+- name: Healthiverse
+  title: Health
+  url: http://healthiverse.net
+  image: design.jpg
+
+- name: Above All House Plants
+  title: House/ Garden
+  url: http://www.aboveallhouseplans.com
+  image: AboveAllHousePlants.jpg
+
+- name: The Reef Shop
+  title: Aquarium Equipment
+  url: http://www.thereefshop.com.au
+  image: TheReefShop.jpg
+
+- name: Philipp Engelhorn
+  title: Photography
+  url: www.philippengelhorn.com
+  image: PhilippEngelhornPhotography.jpg
+
+- name: Ivan Liborio
+  title: Law
+  url: http://www.liborio.adv.br
+  image: LiborioLawOffice.jpg
+
+- name: Stripped Clean
+  title: Maid Service
+  url: http://stripped-clean.com
+  image: StrippedClean.jpg
+
+- name: Talisman Apartments
+  title: Housing
+  url: http://talismanapts.wix.com/talisman
+  image: TalismanApts.jpg
+
+- name: FortGalt
+  title: Retreats Chile
+  url: http://www.fortgalt.com
+  image: FortGalt.jpg
+
+- name: BitFon
+  title: Phone credits
+  url: https://bitfon.pl/
+  image: Bitfon.jpg

_data/merchants-vpn.yml

@@ -1,23 +1,20 @@
 
 - name: BolehVPN
   url: https://bolehvpn.net
+  image: BolehVPN.jpg
 
 - name: VikingVPN
   url: https://vikingvpn.com
-
-- name: QHoster
-  url: http://www.qhoster.com
+  image: VikingVPN.jpg
 
 - name: MultiVPN
   url: http://multi-vpn.co.uk/
+  image: MultiVPN.jpg
 
 - name: AirVPN
   url: https://airvpn.org/
+  image: AirVPN.jpg
 
-- name: Seedstuff
+- name: SeedStuff
   url: http://www.seedstuff.ca
-
-
-
-
-
+  image: SeedStuff.jpg

_i18n/cn.yml

@@ -191,6 +191,18 @@ pages:
 
     youtube-btn: 达世币YouTube
 
+  tos:
+    title: 使用条款
+    terms:
+      请合法的使用达世币。达世币项目及开发人员、工作人员反对任何使用达世币进行的违法行为，不会给予任何的支持与帮助。
+
+      据我们所知，在大部分国家和地区使用达世币是合法的。但是个别地区对虚拟币的管制较为严格，请用户了解当地相关法律后再妥善使用达世币。如果有疑问，请联系当地律师，避免违反当地相关法律。
+
+      本网站及其他网站所发布的内容均不构成法律建议。若有疑问或需要帮助，请联系当地律师。
+
+      本网站及其他网站所发布的内容均不构成投资建议。请根据自己的调查分析自行判断如何投资达世币。
+
+
     # Need some Dash - get content from get-dash ^^
   blog:
       title: 达世币博客

_i18n/en.yml

@@ -22,11 +22,11 @@ pages:
     video-btn: Overview Video
 
     feature-private-heading: Private
-    feature-private-text: Delete your payments history with Private Send.
+    feature-private-text: Preserve your privacy by deleting your payments history with Private-Send.
     feature-instant-heading: Instant
-    feature-instant-text: Dash payments confirm in less than a second.
+    feature-instant-text: Dash Instant-Send payments confirm in less than a second.
     feature-secure-heading: Secure
-    feature-secure-text: Secured by 1,000 Gigahash of X11 ASIC mining.
+    feature-secure-text: Secured by 1,000 Gigahash of X11 ASIC mining and over 4,100 fullnodes hosted by server operators around the world.
 
     merchants-heading: Shop direct with Dash
     merchants-text: Instant and anonymous purchases, direct from your Dash wallet
@@ -51,11 +51,11 @@ pages:
     proposal-submit-btn: Submit a Proposal
 
     network-growth-heading: The Fastest Growing Network
-    network-growth-text: Thanks to incentivization, Dash's network has grown to 3,900 Masternodes meaning Dash is the only currency that can compete with Bitcoin for transaction processing power and future scalability.
+    network-growth-text: Thanks to incentivization, Dash's network has grown to 4,100 Masternodes meaning Dash is the only currency that can compete with Bitcoin for transaction processing power and future scalability.
     network-growth-btn: Network Stats
 
     evolution-heading: Digital Currency Evolution
-    evolution-text: What's next? We are working on a new decentralized service hosted on the masternode network that will open up Dash to web and mobile while being as easy to use as PayPal but still fully decentralized. Stay tuned...
+    evolution-text: What's next? We want cryptocurrencies to be so easy to use your Grandma can use them.  Dash Evolution will enable you to signup and access your Dash from any device, as easily as you do with PayPal, but in a fully decentralized way. Stay tuned...
     evolution-btn: Learn More
     evolution-link: https://dashpay.atlassian.net/wiki/display/DOC/Evolution
 
@@ -124,16 +124,23 @@ pages:
     title: Merchants
     description: Spend Dash at these merchants and services
     hero-image: participate.jpg
-    hero-heading: Spend your Dash
+    hero-heading: Shop with Dash
     hero-text: Spend your Dash instantly and securely at these merchants and services
     hero-map-btn: Merchants Map
     hero-integrate-btn: Integrate Dash
     hero-getlisted-btn: Get Listed
     cards-heading: Debit Cards
-    stores-heading: Web Stores
+    email-heading: Email Providers
     vpn-heading: VPN Providers
+    hosting-heading: Hosting and VPS
+    design-heading: Web & Graphic Design
+    gifts-heading: Gift Cards
+    games-heading: Games
+    casinos-heading: Online Casinos
+    stores-heading: Web Stores
     metals-heading: Precious Metals
 
+
   participate:
     title: Join the Dash Network
     description: Join the Dash Network
@@ -222,16 +229,31 @@ pages:
 
     youtube-btn: Dash YouTube
 
+  tos:
+    title: Terms of Use
+    terms:
+      Dash is only intended for legal purposes and should not be used in any other way. Neither Dash, nor any of it is developers or contributors, support any illegal activities and won’t assist them in any way.
+
+      As far as we know, the use of Dash is not illegal in most jurisdictions. However, some jurisdictions may impose limitations on the use of cryptocurrencies and/or privacy protection tools, so users in those jurisdictions should consider this before using Dash. If in doubt, please contact a local attorney to avoid doing anything that could be considered illegal in your jurisdiction.
+
+      The content of this website, or others associated with Dash, does not constitute legal advice. If you have legal doubts or need assistance, please contact an attorney in your jurisdiction.
+
+      The content of this website or others associated with Dash is not investment advice. You should use your own judgement and research multiple information sources before investing in Dash.
+
     # Need some Dash - get content from get-dash ^^
   blog:
       title: The Digital Cash Blog
-      description: The Digital Cash Blog
+      description: Latest Dash news & information
+      search-btn: Search Blog
+      community-news-btn: Community News
 
   team:
-    title: Team
-    description: The Dash Team
-    core-heading: Core-Team Board
-    core-text: Dash's core team is a group funded by the Dash Network to develop Dash.
+    title: The Dash Team
+    description: The Dash Team is appointed by the Dash Network and funded from the blockchain on a monthly basis from a decentralized governance proposal.
+    core-proposal-btn: Core Proposal
+    core-proposal-link: https://www.dashcentral.org/p/core-team
+    core-approval-btn: Network Approval
+    core-approval-link: http://dashvotetracker.com/history.html?ProposalID=12
 
 nav:
   what-is-dash: What is Dash
@@ -271,6 +293,7 @@ nav:
   technology: Technology
   wiki: Wiki
 
+
   search: Search
 
   social: Social
@@ -286,3 +309,4 @@ nav:
 
   tos: Terms of Use
   sitemap: Sitemap
+  sitesource: Source code

_i18n/en/_posts/2016-07-12-quorum-wiki-selection-now-available.html

@@ -2,6 +2,7 @@
 layout: post
 title: Quorum Wiki Selection now available
 date: 2016-07-12 02:37:44.000000000 -04:00
+image: Quorum Wiki Selection now available.png
 type: post
 published: true
 status: publish

_i18n/en/_posts/2016-07-13-do-you-make-these-4-mistakes-when-explaining-cryptocurrency-to-newcomers-dash-detailed.html

@@ -3,6 +3,7 @@ layout: post
 title: 'Do You Make These 4 Mistakes When Explaining Cryptocurrency to Newcomers?
   | DASH: Detailed'
 date: 2016-07-13 17:22:10.000000000 -04:00
+image: 4-mistakes-explaining-cryptocurrency-.png
 type: post
 published: true
 status: publish

_i18n/en/_posts/2016-07-13-libertyentrepreneurs-with-cindy-zimmerman.html

@@ -2,6 +2,7 @@
 layout: post
 title: LibertyEntrepreneurs with Cindy Zimmerman
 date: 2016-07-13 07:34:03.000000000 -04:00
+image: LibertyEntrepreneurs with Cindy Zimmerman.png
 type: post
 published: true
 status: publish

_i18n/en/_posts/2016-07-14-bitwala-partners-with-shapeshift-accepting-all-major-cryptocurrencies-incl-dash.html

@@ -3,6 +3,7 @@ layout: post
 title: 'Bitwala Partners with ShapeShift: Accepting All Major Cryptocurrencies (incl
   Dash)'
 date: 2016-07-14 06:52:24.000000000 -04:00
+image: bitwala-accepting-all-major-cryptocurrencies-.jpg.jpg
 type: post
 published: true
 status: publish

_i18n/es.yml

@@ -193,6 +193,10 @@ pages:
 
     youtube-btn: Youtube Dash
 
+  tos:
+    title: Condiciones de uso
+    terms: Dash está diseñada para ser usada únicamente de forma legal. Ni Dash, ni ninguno de sus desarrolladores o colaboradores, apoya ninguna actividad ilegal, ni la faverecerá de ninguna manera. Hasta donde podemos saber, Dash no es ilegal en ninguna jurisdicción. Sin embargo, algunas jurisdicciones limitan de alguna manera el uso de criptomonedas y/o herramientas de protección de la privacidad, algo que debe ser tenido en cuenta por los usuarios en esas jurisdicciones antes de usar Dash. En caso de duda, consulte con un abogado local para evitar hacer nada que sea ilegal en su jurisdicción. El contenido de este sitio web, u otros asociados con Dash, no es asesoramiento legal. Si tiene dudas legales o necesita asistencia jurídica, por favor contacte con un abogado local. El contenido de este sitio web, u otros asociados con Dash, no es asesoramiento para invertir. Use su propio juicio e investigue múltiples fuentes de información antes de invertir en Dash.
+
     # Need some Dash - get content from get-dash ^^
   Blog:
       title: El blog del Dinero en Efectivo Digital

_i18n/it.yml

@@ -196,6 +196,9 @@ pages:
 
     youtube-btn: Dash su YouTube
 
+  tos:
+    title: Terms of Use
+
     # Need some Dash - get content from get-dash ^^
   blog:
       title: The Digital Cash Blog

_i18n/pt.yml

@@ -194,6 +194,9 @@ pages:
 
     youtube-btn: Dash YouTube
 
+  tos:
+    title: Terms of Use
+
     # Precisa de Dash - tenha o conteudo get-dash ^^
   blog:
       title: Dinheiro Digital Blog

_i18n/ru.yml

@@ -195,6 +195,18 @@ pages:
 
     youtube-btn: Dash YouTube
 
+  tos:
+    title: Условия использования
+    terms:
+      Dash предназначен исключительно для законного использования и не должен применяться в любых других целях. Ни сам проект Dash, ни любой из его разработчиков или помощников, не поддерживают какую-либо незаконную деятельность и не способствуют ей в какой-либо форме.
+
+      Насколько нам известно, использование Dash не является незаконным в большинстве мировых юрисдикций. Тем ни менее, некоторые юрисдикции могут устанавливать собственные ограничения на использование криптовалют и/или средств защиты приватности – поэтому пользователи, находящиеся в таких юрисдикциях, должны учитывать это перед началом использования Dash. В случае каких-либо сомнений, вам надлежит обратиться к местным адвокатам с целью исключения возможности совершения действий, противоречащих местному законодательству.
+
+      Содержание этого веб-сайта, а также других источников информации, имеющих отношение к Dash, не является средством юридических консультаций. Если у вас появились вопросы по законодательству или вам требуется правовая помощь – пожалуйста, обратитесь к адвокату, компетентному в законодательстве вашей юрисдикции.
+
+      Содержание этого веб-сайта, а также других источников информации, имеющих отношение к Dash, не является инвестиционными советами. Вы должны руководствоваться своими собственными суждениями и исследовать различные источники информации, прежде чем решите инвестировать в Dash.
+
+
     # Need some Dash - get content from get-dash ^^
   blog:
       title: Блог о Цифровой Валюте

_includes/footer.html

@@ -4,7 +4,7 @@
     <ul>
         <li><a href="{{ basenav }}/get-dash/">{% t nav.download %}</a></li>
         <li><a href="https://dashpay.atlassian.net/wiki/display/DOC/How+to+buy+Dash">{% t nav.buy %}</a></li>
-        <li><a href="https://dashpay.atlassian.net/wiki/display/DOC/Merchants">{% t nav.shop %}</a></li>
+        <li><a href="{{ basenav }}/merchants/">{% t nav.shop %}</a></li>
         <li><a href="https://dashpay.atlassian.net/wiki/display/DOC/Debit+Cards">{% t nav.debit %}</a></li>
     </ul>
   </section>
@@ -46,6 +46,7 @@
         <li><a href="https://www.dash.org/forum/categories/dash-support.61/">{% t nav.help %}</a></li>
         <li><a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1146914">{% t nav.info %}</a></li>
         <li><a href="{{ basenav }}/team/">{% t nav.team %}</a></li>
+		<li><a href="https://www.dashfoundation.io/">{% t nav.foundation %}</a></li>
         <li><a href="{{ basenav }}/team/">{% t nav.contact %}</a></li>
     </ul>
   </section>
@@ -66,9 +67,10 @@
 </nav>
 <div class="footer__menu content">
   <div class="footer__languagePicker"></div>
-  <a href="{{ basenav }}/terms-of-use/">Terms of Use</a>
-  <a href="/sitemap.xml">Sitemap</a>
-  <a href="{{ basenav }}/contact/">Contact</a>
+  <a href="{{ basenav }}/terms-of-use/">{% t nav.tos %}</a>
+  <a href="/sitemap.xml">{% t nav.sitemap %}</a>
+  <a href="https://github.com/dashpay/dash-website">{% t nav.sitesource %}</a>
+  <a href="{{ basenav }}/contact/">{% t nav.contact %}</a>
 </div>
 <div class="footer__legal">
   <div class="content">

_includes/hero/blog.html

@@ -1,8 +1,6 @@
 <div class="hero hero--blog" id="hero">
 	<div class="hero__background">
-		{% if pages.blog.hero-image %}
-			<img src="{{ base }}/assets/img/hero/{% t pages.blog.hero-image %}" alt="" class="hero__background-image">
-		{% endif %}
+			<img src="{{ base }}/assets/img/hero/blog.jpg" alt="" class="hero__background-image">
 	</div>
 
 	<!-- Navigation -->
@@ -12,6 +10,13 @@
 	<div class="hero__content">
 		<h1 class="hero__title">{% t pages.blog.title %}</h1>
 		<p class="hero__lead">{% t pages.blog.description %}</p>
+
+		<div class="hero__buttons">
+
+			<a href="#" class="btn-white-solid">{% t pages.blog.search-btn %}</a>
+			<a href="{{ basenav }}/community/#community-news" class="btn-white-solid">{% t pages.blog.community-news-btn %}</a>
+
+		</div>
 	</div>
 
 	<!-- Hero stripe -->

_includes/hero/team.html

@@ -1,9 +1,6 @@
 <div class="hero hero--team" id="hero">
 	<div class="hero__background">
-	<!-- {% srcset dashorg-nodes.jpg ppi:1,2 class="hero__background-image" %}
-			{% srcset_source width:1920 %}
-			{% srcset_source width:960 %}
-		{% endsrcset %} -->
+		<img src="{{ base }}/assets/img/hero/team.jpg" alt="" class="hero__background-image">
 	</div>
 
 	<!-- Navigation -->
@@ -13,8 +10,14 @@
 	<div class="hero__content">
 		<h1 class="hero__title">{% t pages.team.title %}</h1>
 		<p class="hero__lead">{% t pages.team.description %}</p>
-	</div>
 
+		<div class="hero__buttons">
+
+			<a href="{% t pages.team.core-proposal-link %}" class="btn-white-solid">{% t pages.team.core-proposal-btn %}</a>
+			<a href="{% t pages.team.core-approval-link %}" class="btn-white-solid">{% t pages.team.core-approval-btn %}</a>
+
+		</div>
+	</div>
 	<!-- Hero stripe -->
 	<div class="hero__stripe"></div>
 </div>

_includes/hero/tos.html

@@ -0,0 +1,18 @@
+<div class="hero hero--space" id="hero">
+	<div class="hero__background">
+
+		<img src="{{ base }}/assets/img/hero/merchants.png" alt="" class="hero__background-image">
+
+	</div>
+
+	<!-- Navigation -->
+	{% include nav-desktop.html %}
+
+	<!-- Hero content -->
+	<div class="hero__content">
+		<h1 class="hero__title">{% t pages.tos.title %}</h1>
+	</div>
+
+	<!-- Hero stripe -->
+	<div class="hero__stripe"></div>
+</div>

blog/index.html

@@ -16,7 +16,7 @@ description: pages.blog.description
 				<article class="featurepost">
 					<div class="featurepost__preview {% if post.image %}featurepost__preview--image{% else %}featurepost__preview--no-image{% endif %}">
 						{% if post.image %}
-							<img src="{{ post.image }}" class="featurepost__image">
+							<img src="{{ basenav }}/assets/img/blog/{{ post.image }}" class="featurepost__image">
 						{% endif %}
 					</div>
 

index.html

@@ -38,6 +38,17 @@ description: pages.home.description
 
 			<div class="ctabox ctabox--gray-light-bg" data-js-ctabox>
 				<div class="ctabox__inner">
+					<article class="ctabox__cta" data-js-ctabox-item>
+						<a href="https://shakepay.co" target="_blank" class="ctabox__link">
+							<div class="ctabox__imagewrapper">
+								<img src="/assets/img/merchants/shakepay_logo.png" class="ctabox__image">
+							</div>
+							<div class="ctabox__text">
+								<h4 class="ctabox__title">Shake Pay</h4>
+								<p class="ctabox__description">Dash-Visa Debit Card</p>
+							</div>
+						</a>
+					</article>
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://www.livingroomofsatoshi.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
@@ -49,17 +60,6 @@ description: pages.home.description
 							</div>
 						</a>
 					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/merchants/misconductwine_logo.jpg" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-							<h4 class="ctabox__title">Misconduct Wine</h4>
-							<p class="ctabox__description">Premium micro-lot wines</p>
-							</div>
-						</a>
-					</article>
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://www.bolehvpn.net/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
@@ -71,6 +71,17 @@ description: pages.home.description
 							</div>
 						</a>
 					</article>
+					<article class="ctabox__cta" data-js-ctabox-item>
+						<a href="https://node40.com" target="_blank" class="ctabox__link">
+							<div class="ctabox__imagewrapper">
+								<img src="/assets/img/merchants/node40.png" class="ctabox__image">
+							</div>
+							<div class="ctabox__text">
+								<h4 class="ctabox__title">Node40</h4>
+								<p class="ctabox__description">Masternode Hosting</p>
+							</div>
+						</a>
+					</article>
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://shapeshift.io" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
@@ -82,28 +93,6 @@ description: pages.home.description
 							</div>
 						</a>
 					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://node40.com" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/merchants/node40.png" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-							<h4 class="ctabox__title">Node40</h4>
-							<p class="ctabox__description">Masternode Hosting</p>
-							</div>
-						</a>
-					</article>
-					<article class="ctabox__cta" data-js-ctabox-item>
-						<a href="https://protonmail.com/" target="_blank" class="ctabox__link">
-							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/merchants/protonmail.png" class="ctabox__image">
-							</div>
-							<div class="ctabox__text">
-							<h4 class="ctabox__title">ProtonMail</h4>
-							<p class="ctabox__description">Secure, Private Email</p>
-							</div>
-						</a>
-					</article>
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://www.qhoster.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
@@ -170,6 +159,28 @@ description: pages.home.description
 							</div>
 						</a>
 					</article>
+					<article class="ctabox__cta" data-js-ctabox-item>
+						<a href="https://protonmail.com/" target="_blank" class="ctabox__link">
+							<div class="ctabox__imagewrapper">
+								<img src="/assets/img/merchants/protonmail.png" class="ctabox__image">
+							</div>
+							<div class="ctabox__text">
+								<h4 class="ctabox__title">ProtonMail</h4>
+								<p class="ctabox__description">Secure, Private Email</p>
+							</div>
+						</a>
+					</article>
+					<article class="ctabox__cta" data-js-ctabox-item>
+						<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
+							<div class="ctabox__imagewrapper">
+								<img src="/assets/img/merchants/misconductwine_logo.jpg" class="ctabox__image">
+							</div>
+							<div class="ctabox__text">
+								<h4 class="ctabox__title">Misconduct Wine</h4>
+								<p class="ctabox__description">Premium micro-lot wines</p>
+							</div>
+						</a>
+					</article>
 				</div>
 			</div>
 
@@ -282,7 +293,7 @@ description: pages.home.description
 					<a href="{% t pages.home.evolution-link %}" class="btn-blue">{% t pages.home.evolution-btn %}</a>
 				</div>
 				<div class="col-sm-6 col-sm-pull-6 home-evolution-graphic">
-					<img src="/assets/img/home/stock-photo-63187555-she-ll-source-whatever-her-customers-are-looking-for.jpg" alt="Merchant using a laptop">
+					<img src="/assets/img/home/evo.png" alt="Dash Evolution">
 				</div>
 			</div>
 		</div>
@@ -301,7 +312,7 @@ description: pages.home.description
 					<div class="news-post">
 						<div class="news-image">
 							{% if post.image %}
-								<img src="{{ post.image }}">
+								<img src="{{ basenav }}/assets/img/blog/{{ post.image }}">
 							{% endif %}
 						</div>
 						<div class="news-body">

merchants/index.html

@@ -14,8 +14,8 @@ description: pages.merchants.description
 				<h2 class="section__title">{% t pages.merchants.cards-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h1>
 			</div>
 			<ul class="member-list member-list--merchants">
-				{% for merchant in site.data.merchants-stores %}
-					{% include merchant-list.html %}
+				{% for merchant in site.data.merchants-cards %}
+				{% include merchant-list.html %}
 				{% endfor %}
 			</ul>
 		</div>
@@ -24,10 +24,10 @@ description: pages.merchants.description
 	<section class="section section--intro-lead">
 		<div class="section__content content">
 			<div class="section__intro">
-				<h2 class="section__title">{% t pages.merchants.stores-heading %}</h1>
+				<h2 class="section__title">{% t pages.merchants.email-heading %}</h1>
 			</div>
 			<ul class="member-list member-list--merchants">
-				{% for merchant in site.data.merchants-cards %}
+				{% for merchant in site.data.merchants-email %}
 				{% include merchant-list.html %}
 				{% endfor %}
 			</ul>
@@ -41,7 +41,85 @@ description: pages.merchants.description
 			</div>
 			<ul class="member-list member-list--merchants">
 				{% for merchant in site.data.merchants-vpn %}
-					{% include merchant-list.html %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.hosting-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-hosting %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.design-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-design %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.gifts-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-gifts %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.games-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-games %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.casinos-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-casinos %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.stores-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-stores %}
+				{% include merchant-list.html %}
 				{% endfor %}
 			</ul>
 		</div>

team/index.html

@@ -13,8 +13,6 @@ description: pages.team.description
 		<div class="section__content content">
 			<div class="section__intro">
 				<h1 class="section__title">{% t pages.team.core-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h1>
-
-				<div class="section__lead">{% tmd pages.team.core-text %}</div>
 			</div>
 			<ul class="member-list">
 				{% for member in site.data.team %}
@@ -22,10 +20,10 @@ description: pages.team.description
 				{% endfor %}
 			</ul>
 		</div>
-
+		<!--
 		<div class="section__content content">
 			<div>
-				<h2 class="section__title">{% t pages.community.social-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h2>
+				<h2 class="section__title">{% t pages.community.social-heading %}</h2>
 			</div>
 			<ul class="member-list">
 				{% for member in site.data.team %}
@@ -33,6 +31,6 @@ description: pages.team.description
 				{% endfor %}
 			</ul>
 		</div>
-
+		-->
 	</section>
 </div>

terms-of-use/index.html

@@ -1 +1,20 @@
-Placeholder for Terms of Use page.
+---
+layout: default
+title: pages.tos.title
+description: pages.tos.description
+---
+
+{% include hero/tos.html %}
+
+<div class="page page--home">
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h1 class="section__title">{% t pages.tos.title %}</h1>
+			</div>
+			<div>{% t pages.tos.terms %}</div>
+		</div>
+	</section>
+
+</div>