58 files changed, 217 insertions, 111 deletions

diff --git a/site/content/_index.md b/site/content/_index.md
new file mode 100644
index 0000000..02e819d
--- /dev/null
+++ b/site/content/_index.md
@@ -0,0 +1,20 @@
+---
+title: "Great coffee with a conscience"
+subtitle: Support sustainable farming while enjoying a cup
+image: /img/home-jumbotron.jpg
+blurb:
+    heading: Why Kaldi?
+    text: "Kaldi is the coffee store for everyone who believes that great coffee shouldn't just taste good, it should do good too. We source all of our beans directly from small scale sustainable farmers and make sure part of the profits are reinvested in their communities."
+intro:
+    heading: "What we offer"
+    text: "Kaldi is the ultimate spot for coffee lovers who want to learn about their java’s origin and support the farmers that grew it. We take coffee production, roasting and brewing seriously and we’re glad to pass that knowledge to anyone."
+products:
+    - image: img/illustrations-coffee.svg
+      text: "We sell green and roasted coffee beans that are sourced directly from independent farmers and farm cooperatives. We’re proud to offer a variety of coffee beans grown with great care for the environment and local communities. Check our post or contact us directly for current availability."
+    - image: /img/illustrations-coffee-gear.svg
+      text: "We offer a small, but carefully curated selection of brewing gear and tools for every taste and experience level. No matter if you roast your own beans or just bought your first french press, you’ll find a gadget to fall in love with in our shop."
+values:
+    heading: Our values
+    text: Coffee is an amazing part of human culture but it has a dark side too – one of colonialism and mindless abuse of natural resources and human lives. We want to turn this around and return the coffee trade to the drink’s exhilarating, empowering and unifying nature.
+---
+
diff --git a/site/content/contact.md b/site/content/contact.md
deleted file mode 100644
index fd0b607..0000000
--- a/site/content/contact.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-title = "Contact"
-type = "contact"
-page="/contact.html"
-+++
diff --git a/site/content/contact/_index.md b/site/content/contact/_index.md
new file mode 100644
index 0000000..1b34ee8
--- /dev/null
+++ b/site/content/contact/_index.md
@@ -0,0 +1,19 @@
+---
+title: "Contact"
+logo: "/img/logo.svg"
+contact_entries:
+  - heading: Location
+    text: "3153 Lynn Avenue, South San Francisco, California 94080"
+  - heading: Working hours
+    text: "Monday – Saturday: 9AM – 7PM We’re closed on Sundays"
+---
+
+We’d love to get in touch with you and hear your ideas and
+questions. We strive to grow and improve constantly and your feedback
+is valuable for us.
+
+<h3 class="f4 b lh-title mb2">How can I get…?</h3>
+
+You can also use the form below for any inquiries about coffee
+availability, monthly subscriptions and scheduling a 1-on-1 session
+with our baristas. Don’t be shy, drop us a line!
diff --git a/site/content/post/brewing-chemex.md b/site/content/post/brewing-chemex.md
index 11ddd0c..a64363a 100644
--- a/site/content/post/brewing-chemex.md
+++ b/site/content/post/brewing-chemex.md
@@ -5,7 +5,7 @@ description: >-
   Brewing with a Chemex probably seems like a complicated, time-consuming
   ordeal, but once you get used to the process, it becomes a soothing ritual
   that's worth the effort every time.
-image: /img/blog/chemex.jpg
+image: /img/blog-chemex.jpg
 ---
 
 This [week](/wdwdw) we’ll **take** a look at all the steps required to make astonishing coffee with a Chemex at home. The Chemex Coffeemaker is a manual, pour-over style glass-container coffeemaker that Peter Schlumbohm invented in 1941, and which continues to be manufactured by the Chemex Corporation in Chicopee, Massachusetts\*.
@@ -23,4 +23,4 @@ The Chemex Coffeemaker consists of an hourglass-shaped glass flask with a conica
 
 The most visually distinctive feature of the Chemex is the heatproof wooden collar around the neck, allowing it to be handled and poured when full of hot water. This is turned, then split in two to allow it to fit around the glass neck. The two pieces are held loosely in place by a tied leather thong. The pieces are not tied tightly and can still move slightly, retained by the shape of the conical glass.
 
-For a design piece that became popular post-war at a time of Modernism and precision manufacture, this juxtaposition of natural wood and the organic nature of a hand-tied knot with the laboratory nature of glassware was a distinctive feature of its appearance.
\ No newline at end of file
+For a design piece that became popular post-war at a time of Modernism and precision manufacture, this juxtaposition of natural wood and the organic nature of a hand-tied knot with the laboratory nature of glassware was a distinctive feature of its appearance.
diff --git a/site/content/post/making-sense.md b/site/content/post/making-sense.md
index 3d6c8b5..3573c31 100644
--- a/site/content/post/making-sense.md
+++ b/site/content/post/making-sense.md
@@ -2,7 +2,7 @@
 title: "Making sense of the SCAA’s new Flavor Wheel"
 date: 2016-12-17T15:04:10.000Z
 description: The Coffee Taster’s Flavor Wheel, the official resource used by coffee tasters, has been revised for the first time this year.
-image: /img/blog/flavor_wheel.jpg
+image: /img/blog-flavor_wheel.jpg
 ---
 
 The SCAA updated the wheel to reflect the finer nuances needed to describe flavors more precisely. The new descriptions are more detailed and hence allow cuppers to distinguish between more flavors.
diff --git a/site/content/products.md b/site/content/products/_index.md
index 62fd0f0..b8d4b63 100644
--- a/site/content/products.md
+++ b/site/content/products/_index.md
@@ -1,8 +1,7 @@
 ---
 title: Our Coffee
 type: products
-page: /products.html
-image: /img/products/jumbotron.jpg
+image: /img/products-jumbotron.jpg
 heading: What we offer
 description: >-
   Kaldi is the ultimate spot for coffee lovers who want to learn about their
@@ -11,27 +10,27 @@ description: >-
   anyone.
 intro:
   blurbs:
-    - image: /img/illustrations/coffee.svg
+    - image: /img/illustrations-coffee.svg
       text: >
         We sell green and roasted coffee beans that are sourced directly from
         independent farmers and farm cooperatives. We’re proud to offer a
         variety of coffee beans grown with great care for the environment and
         local communities. Check our post or contact us directly for current
         availability.
-    - image: /img/illustrations/coffee-gear.svg
+    - image: /img/illustrations-coffee-gear.svg
       text: >
         We offer a small, but carefully curated selection of brewing gear and
         tools for every taste and experience level. No matter if you roast your
         own beans or just bought your first french press, you’ll find a gadget
         to fall in love with in our shop.
-    - image: /img/illustrations/tutorials.svg
+    - image: /img/illustrations-tutorials.svg
       text: >
         Love a great cup of coffee, but never knew how to make one? Bought a
         fancy new Chemex but have no clue how to use it? Don't worry, we’re here
         to help. You can schedule a custom 1-on-1 consultation with our baristas
         to learn anything you want to know about coffee roasting and brewing.
         Email us or call the store for details.
-    - image: /img/illustrations/meeting-space.svg
+    - image: /img/illustrations-meeting-space.svg
       text: >
         We believe that good coffee has the power to bring people together.
         That’s why we decided to turn a corner of our shop into a cozy meeting
@@ -53,13 +52,13 @@ main:
     optimal for the plants, farmers and the local environment.
   image1:
     alt: A close-up of a paper filter filled with ground coffee
-    image: /img/products/products-grid3.jpg
+    image: /img/products-grid3.jpg
   image2:
     alt: A green cup of a coffee on a wooden table
-    image: /img/products/products-grid2.jpg
+    image: /img/products-grid2.jpg
   image3:
     alt: Coffee beans
-    image: /img/products/products-grid1.jpg
+    image: /img/products-grid1.jpg
 testimonials:
   - author: Elisabeth Kaurismäki
     quote: >-
@@ -69,7 +68,7 @@ testimonials:
     quote: >-
       Kaldi is the place to go if you want the best quality coffee. I love their
       stance on empowering farmers and transparency.
-full_image: /img/products/products-full-width.jpg
+full_image: /img/products-full-width.jpg
 pricing:
   heading: Monthly subscriptions
   description: >-
diff --git a/site/content/values.md b/site/content/values.md
deleted file mode 100644
index 3dcd089..0000000
--- a/site/content/values.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-title = "Values"
-type = "values"
-page="/values.html"
-+++
diff --git a/site/content/values/_index.md b/site/content/values/_index.md
new file mode 100644
index 0000000..b92073d
--- /dev/null
+++ b/site/content/values/_index.md
@@ -0,0 +1,45 @@
+---
+title: "Values"
+image: /img/about-jumbotron.jpg
+values:
+  - heading: "Shade-grown coffee"
+    text: >
+      Coffee is a small tree or shrub that grows in the forest
+      understory in its wild form, and traditionally was grown
+      commercially under other trees that provided shade. The
+      forest-like structure of shade coffee farms provides habitat for
+      a great number of migratory and resident species.
+    imageUrl: "/img/about-shade-grown.jpg"
+  - heading: "Single origin"
+    text: >
+      Single-origin coffee is coffee grown within a single known
+      geographic origin. Sometimes, this is a single farm or a
+      specific collection of beans from a single country. The name of
+      the coffee is then usually the place it was grown to whatever
+      degree available.
+    imageUrl: "/img/about-single-origin.jpg"
+  - heading: "Sustainable farming"
+    text: >
+      Sustainable agriculture is farming in sustainable ways based on
+      an understanding of ecosystem services, the study of
+      relationships between organisms and their environment. What
+      grows where and how it is grown are a matter of choice and
+      careful consideration for nature and communities.
+    imageUrl: "/img/about-sustainable-farming.jpg"
+  - heading: "Direct sourcing"
+    text: >
+      We want to truly empower the communities that bring amazing
+      coffee to you. That’s why we reinvest 20% of our profits into
+      farms, local businesses and schools everywhere our coffee is
+      grown. You can see the communities grow and learn more about
+      coffee farming on our blog.
+    imageUrl: "/img/about-direct-sourcing.jpg"
+  - heading: "Reinvest profits"
+    text: >
+      We want to truly empower the communities that bring amazing
+      coffee to you. That’s why we reinvest 20% of our profits into
+      farms, local businesses and schools everywhere our coffee is
+      grown. You can see the communities grow and learn more about
+      coffee farming on our blog.
+    imageUrl: "/img/about-reinvest-profits.jpg"
+---
diff --git a/site/layouts/contact/single.html b/site/layouts/contact/single.html
deleted file mode 100644
index 07e5ce4..0000000
--- a/site/layouts/contact/single.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{{ partial "head" . }}
-
-{{ partial "nav" . }}
-
-<div class="ph3 bg-off-white">
-	<div class="center mw6 pv3">
-
-		<img src="/img/logo.svg" alt="" class="db w4 center pv4">
-
-		<p>We’d love to get in touch with you and hear your ideas and questions. We strive to grow and improve constantly and your feedback is valuable for us.</p>
-
-		<h3 class="f4 b lh-title mb2">How can I get…?</h3>
-		<p>You can also use the form below for any inquiries about coffee availability, monthly subscriptions and scheduling a 1-on-1 session with our baristas. Don’t be shy, drop us a line!</p>
-
-		<div class="flex-ns mb3">
-
-			<div>
-				<h4 class="f4 b lh-title mb2 primary">Location</h4>
-				<p>3153 Lynn Avenue, South San Francisco, California 94080</p>
-			</div>
-
-			<div>
-				<h4 class="f4 b lh-title mb2 primary">Working hours</h4>
-				<p>Monday – Saturday: 9AM – 7PM We’re closed on Sundays</p>
-			</div>
-
-		</div>
-
-		{{ partial "contact-form" . }}
-
-	</div>
-</div>
-
-{{ partial "footer" . }}
diff --git a/site/layouts/index.html b/site/layouts/index.html
index e57ce45..a21df24 100644
--- a/site/layouts/index.html
+++ b/site/layouts/index.html
@@ -2,13 +2,13 @@
 
 {{ partial "nav" . }}
 
-{{ partial "jumbotron" (dict "imageUrl" "/img/home/jumbotron.jpg" "title" "Great coffee with a conscience" "subtitle" "Support sustainable farming while enjoying a cup") }}
+{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title "subtitle" .Params.subtitle) }}
 
-{{ partial "short-text" (dict "heading" "Why Kaldi?" "text" "Kaldi is the coffee store for everyone who believes that great coffee shouldn't just taste good, it should do good too. We source all of our beans directly from small scale sustainable farmers and make sure part of the profits are reinvested in their communities.")}}
+{{ partial "short-text" .Params.blurb}}
 
-{{ partial "2-up" (dict "heading" "What we offer" "description" "Kaldi is the ultimate spot for coffee lovers who want to learn about their java’s origin and support the farmers that grew it. We take coffee production, roasting and brewing seriously and we’re glad to pass that knowledge to anyone." "svg1" "img/illustrations/coffee.svg" "text1" "We sell green and roasted coffee beans that are sourced directly from independent farmers and farm cooperatives. We’re proud to offer a variety of coffee beans grown with great care for the environment and local communities. Check our post or contact us directly for current availability." "svg2" "/img/illustrations/coffee-gear.svg" "text2" "We offer a small, but carefully curated selection of brewing gear and tools for every taste and experience level. No matter if you roast your own beans or just bought your first french press, you’ll find a gadget to fall in love with in our shop." "buttonText" "See all products" "buttonLink" "/products"  ) }}
+{{ partial "2-up" .Params }}
 
-{{ partial "text-and-image" (dict "heading" "Our values" "text" "Coffee is an amazing part of human culture but it has a dark side too – one of colonialism and mindless abuse of natural resources and human lives. We want to turn this around and return the coffee trade to the drink’s exhilarating, empowering and unifying nature." "buttonText" "Read more" "buttonLink" "/values") }}
+{{ partial "text-and-image" (dict "heading" .Params.values.heading "text" .Params.values.text "buttonText" "Read more" "buttonLink" "/values") }}
 
 {{ partial "blog" . }}
 
diff --git a/site/layouts/partials/2-up.html b/site/layouts/partials/2-up.html
index 06849f0..ab827b4 100644
--- a/site/layouts/partials/2-up.html
+++ b/site/layouts/partials/2-up.html
@@ -1,24 +1,19 @@
 <div class="bg-off-white pv4">
   <div class="ph3 mw7 center">
-    <h2 class="f2 b lh-title mb2">{{.heading}}</h2>
-    <p class="mb4 mw6">{{.description}}</p>
+    <h2 class="f2 b lh-title mb2">{{.intro.heading}}</h2>
+    <p class="mb4 mw6">{{.intro.text}}</p>
 
     <div class="flex-ns mhn2-ns mb3">
+      {{ range .products }}
       <div class="ph2-ns w-50-ns">
-        <img src="{{.svg1}}" alt="" class="center db mb3" style="width: 240px">
-        <p>{{.text1}}</p>
-      </div>
-
-      <div class="ph2-ns w-50-ns">
-        <img src="{{.svg2}}" alt="" class="center db mb3" style="width: 240px">
-        <p>{{.text2}}</p>
+        <img src="{{.image}}" alt="" class="center db mb3" style="width: 240px">
+        <p>{{.text}}</p>
       </div>
+      {{ end }}
     </div>
 
-    {{ if .buttonText }}
-      <div class="tc">
-        <a href="{{.buttonLink}}" class="btn raise">{{.buttonText}}</a>
-      </div>
-    {{ end }}
+    <div class="tc">
+      <a href="/products" class="btn raise">See all products</a>
+    </div>
   </div>
 </div>
diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html
index b69672e..5547c82 100644
--- a/site/layouts/partials/footer.html
+++ b/site/layouts/partials/footer.html
@@ -36,10 +36,10 @@
 			<div>
 				<h3 class="f4 b lh-title mb2 primary">Social media</h3>
 				<ul class="mhn2">
-					{{ partial "social-icon" (dict "link" "#" "svg" "facebook") }}
-					{{ partial "social-icon" (dict "link" "#" "svg" "twitter") }}
-					{{ partial "social-icon" (dict "link" "#" "svg" "instagram") }}
-					{{ partial "social-icon" (dict "link" "#" "svg" "vimeo") }}
+					{{ partial "social-icon" (dict "link" "#" "svg" "icons-facebook") }}
+					{{ partial "social-icon" (dict "link" "#" "svg" "icons-twitter") }}
+					{{ partial "social-icon" (dict "link" "#" "svg" "icons-instagram") }}
+					{{ partial "social-icon" (dict "link" "#" "svg" "icons-vimeo") }}
 				</ul>
 			</div>
 
diff --git a/site/layouts/partials/head.html b/site/layouts/partials/head.html
index b58be17..9e75f44 100644
--- a/site/layouts/partials/head.html
+++ b/site/layouts/partials/head.html
@@ -12,18 +12,18 @@
 		<link href="https://fonts.googleapis.com/css?family=Nunito+Sans:400,700" rel="stylesheet">
 
 		<!-- Favicons -->
-		<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-		<link rel="icon" type="image/png" href="/favicon-32x32.png" sizes="32x32">
-		<link rel="icon" type="image/png" href="/favicon-16x16.png" sizes="16x16">
+		<link rel="apple-touch-icon" sizes="180x180" href="/img/apple-touch-icon.png">
+		<link rel="icon" type="image/png" href="/img/favicon-32x32.png" sizes="32x32">
+		<link rel="icon" type="image/png" href="/img/favicon-16x16.png" sizes="16x16">
 		<link rel="manifest" href="/manifest.json">
-		<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#ff4400">
+		<link rel="mask-icon" href="/img/safari-pinned-tab.svg" color="#ff4400">
 		<meta name="theme-color" content="#fff">
 
 		<!-- Open Graph -->
 		<meta property="og:type" content="business.business">
 		<meta property="og:title" content="Kaldi | Great coffee with a conscience">
 		<meta property="og:url" content="/">
-		<meta property="og:image" content="/og-image.jpg">
+		<meta property="og:image" content="/img/og-image.jpg">
 
 		<script src="https://identity.netlify.com/v1/netlify-identity-widget.js"></script>
 	</head>
diff --git a/site/layouts/partials/svg.html b/site/layouts/partials/svg.html
index 5a7068f..25e80a9 100644
--- a/site/layouts/partials/svg.html
+++ b/site/layouts/partials/svg.html
@@ -1,5 +1,5 @@
 <div style="height: 0; width: 0; position: absolute; visibility: hidden">
 	<!-- inject:svg -->
-  <svg xmlns="http://www.w3.org/2000/svg"><symbol id="facebook" viewBox="0 0 32 32"><path d="M30.7 0H1.3C.6 0 0 .6 0 1.3v29.3c0 .8.6 1.4 1.3 1.4H17V20h-4v-5h4v-4c0-4.1 2.6-6.2 6.3-6.2 1.8 0 3.3.2 3.7.2v4.3h-2.6c-2 0-2.5 1-2.5 2.4V15h5l-1 5h-4l.1 12h8.6c.7 0 1.3-.6 1.3-1.3V1.3C32 .6 31.4 0 30.7 0z"/></symbol><symbol id="instagram" viewBox="0 0 32 32"><path d="M28.2 0H3.8C1.7 0 0 1.7 0 3.8v24.4C0 30.3 1.7 32 3.8 32h24.4c2.1 0 3.8-1.7 3.8-3.8V3.8C32 1.7 30.3 0 28.2 0zM24 4h3c.6 0 1 .4 1 1v3c0 .6-.4 1-1 1h-3c-.6 0-1-.4-1-1V5c0-.6.4-1 1-1zm-8 5.9c3.4 0 6.2 2.7 6.2 6.1 0 3.4-2.8 6.1-6.2 6.1-3.4 0-6.2-2.7-6.2-6.1.1-3.4 2.8-6.1 6.2-6.1zM28 29H4c-.6 0-1-.4-1-1V13h4c-.5.8-.7 2.1-.7 3 0 5.4 4.4 9.7 9.7 9.7 5.4 0 9.7-4.4 9.7-9.7 0-.9-.1-2.3-.8-3h4v15c.1.6-.3 1-.9 1z"/></symbol><symbol id="twitter" viewBox="0 0 32 32"><path d="M32 6.1c-1.2.5-2.4.9-3.8 1 1.4-.8 2.4-2.1 2.9-3.6-1.3.8-2.7 1.3-4.2 1.6C25.7 3.8 24 3 22.2 3c-3.6 0-6.6 2.9-6.6 6.6 0 .5.1 1 .2 1.5-5.5-.3-10.3-2.9-13.6-6.9-.6 1-.9 2.1-.9 3.3 0 2.3 1.2 4.3 2.9 5.5-1.1 0-2.1-.3-3-.8v.1c0 3.2 2.3 5.8 5.3 6.4-.6.1-1.1.2-1.7.2-.4 0-.8 0-1.2-.1.8 2.6 3.3 4.5 6.1 4.6-2.2 1.8-5.1 2.8-8.2 2.8-.5 0-1.1 0-1.6-.1 3 1.8 6.5 2.9 10.2 2.9 12.1 0 18.7-10 18.7-18.7v-.8c1.2-1 2.3-2.1 3.2-3.4z"/></symbol><symbol id="vimeo" viewBox="0 0 32 32"><path d="M32 8.6c-.1 3.1-2.3 7.4-6.5 12.8-4.4 5.7-8 8.5-11 8.5-1.9 0-3.4-1.7-4.7-5.2-.9-3.2-1.7-6.3-2.6-9.5-1-3.4-2-5.2-3.1-5.2-.2 0-1.1.5-2.5 1.5L0 9.6c1.6-1.4 3.1-2.8 4.7-4.2 2.1-1.8 3.7-2.8 4.7-2.9 2.5-.2 4 1.5 4.6 5.1.6 3.9 1.1 6.4 1.3 7.3.7 3.3 1.5 4.9 2.4 4.9.7 0 1.7-1.1 3-3.2s2.1-3.7 2.2-4.8c.2-1.8-.5-2.7-2.2-2.7-.8 0-1.6.2-2.4.5 1.6-5.2 4.6-7.7 9-7.5 3.3.2 4.9 2.3 4.7 6.5z"/></symbol></svg>
+  <svg xmlns="http://www.w3.org/2000/svg"><symbol id="icons-facebook" viewBox="0 0 32 32"><path d="M30.7 0H1.3C.6 0 0 .6 0 1.3v29.3c0 .8.6 1.4 1.3 1.4H17V20h-4v-5h4v-4c0-4.1 2.6-6.2 6.3-6.2 1.8 0 3.3.2 3.7.2v4.3h-2.6c-2 0-2.5 1-2.5 2.4V15h5l-1 5h-4l.1 12h8.6c.7 0 1.3-.6 1.3-1.3V1.3C32 .6 31.4 0 30.7 0z"/></symbol><symbol id="icons-instagram" viewBox="0 0 32 32"><path d="M28.2 0H3.8C1.7 0 0 1.7 0 3.8v24.4C0 30.3 1.7 32 3.8 32h24.4c2.1 0 3.8-1.7 3.8-3.8V3.8C32 1.7 30.3 0 28.2 0zM24 4h3c.6 0 1 .4 1 1v3c0 .6-.4 1-1 1h-3c-.6 0-1-.4-1-1V5c0-.6.4-1 1-1zm-8 5.9c3.4 0 6.2 2.7 6.2 6.1 0 3.4-2.8 6.1-6.2 6.1-3.4 0-6.2-2.7-6.2-6.1.1-3.4 2.8-6.1 6.2-6.1zM28 29H4c-.6 0-1-.4-1-1V13h4c-.5.8-.7 2.1-.7 3 0 5.4 4.4 9.7 9.7 9.7 5.4 0 9.7-4.4 9.7-9.7 0-.9-.1-2.3-.8-3h4v15c.1.6-.3 1-.9 1z"/></symbol><symbol id="icons-twitter" viewBox="0 0 32 32"><path d="M32 6.1c-1.2.5-2.4.9-3.8 1 1.4-.8 2.4-2.1 2.9-3.6-1.3.8-2.7 1.3-4.2 1.6C25.7 3.8 24 3 22.2 3c-3.6 0-6.6 2.9-6.6 6.6 0 .5.1 1 .2 1.5-5.5-.3-10.3-2.9-13.6-6.9-.6 1-.9 2.1-.9 3.3 0 2.3 1.2 4.3 2.9 5.5-1.1 0-2.1-.3-3-.8v.1c0 3.2 2.3 5.8 5.3 6.4-.6.1-1.1.2-1.7.2-.4 0-.8 0-1.2-.1.8 2.6 3.3 4.5 6.1 4.6-2.2 1.8-5.1 2.8-8.2 2.8-.5 0-1.1 0-1.6-.1 3 1.8 6.5 2.9 10.2 2.9 12.1 0 18.7-10 18.7-18.7v-.8c1.2-1 2.3-2.1 3.2-3.4z"/></symbol><symbol id="icons-vimeo" viewBox="0 0 32 32"><path d="M32 8.6c-.1 3.1-2.3 7.4-6.5 12.8-4.4 5.7-8 8.5-11 8.5-1.9 0-3.4-1.7-4.7-5.2-.9-3.2-1.7-6.3-2.6-9.5-1-3.4-2-5.2-3.1-5.2-.2 0-1.1.5-2.5 1.5L0 9.6c1.6-1.4 3.1-2.8 4.7-4.2 2.1-1.8 3.7-2.8 4.7-2.9 2.5-.2 4 1.5 4.6 5.1.6 3.9 1.1 6.4 1.3 7.3.7 3.3 1.5 4.9 2.4 4.9.7 0 1.7-1.1 3-3.2s2.1-3.7 2.2-4.8c.2-1.8-.5-2.7-2.2-2.7-.8 0-1.6.2-2.4.5 1.6-5.2 4.6-7.7 9-7.5 3.3.2 4.9 2.3 4.7 6.5z"/></symbol></svg>
   <!-- endinject -->
 </div>
diff --git a/site/layouts/partials/text-and-image.html b/site/layouts/partials/text-and-image.html
index ff3bd7c..7a55f15 100644
--- a/site/layouts/partials/text-and-image.html
+++ b/site/layouts/partials/text-and-image.html
@@ -3,13 +3,13 @@
 
 		<div class="flex-l mhn2-l">
 			<div class="w-40-l ph2-l">
-				<h2 class="f2 b lh-title mb2">{{.heading}}</h1>
+				<h2 class="f2 b lh-title mb2">{{.heading}}</h2>
 
 				<p>{{.text}}</p>
 			</div>
 
 			<div class="w-60-l ph2-l">
-				<img src="img/home/about-section.jpg" alt="" class="mb3">
+				<img src="img/home-about-section.jpg" alt="" class="mb3">
 			</div>
 		</div>
 
diff --git a/site/layouts/section/contact.html b/site/layouts/section/contact.html
new file mode 100644
index 0000000..205d92e
--- /dev/null
+++ b/site/layouts/section/contact.html
@@ -0,0 +1,26 @@
+{{ partial "head" . }}
+
+{{ partial "nav" . }}
+
+<div class="ph3 bg-off-white">
+	<div class="center mw6 pv3">
+
+		<img src="{{ .Params.logo }}" alt="" class="db w4 center pv4">
+
+		{{ .Content }}
+
+		<div class="flex-ns mb3">
+	        	{{ range .Params.contact_entries }}
+				<div>
+					<h4 class="f4 b lh-title mb2 primary">{{ .heading }}</h4>
+					<p>{{ .text }}</p>
+				</div>
+			{{ end }}
+		</div>
+
+		{{ partial "contact-form" . }}
+
+	</div>
+</div>
+
+{{ partial "footer" . }}
diff --git a/site/layouts/products/single.html b/site/layouts/section/products.html
index bf430ca..bf430ca 100644
--- a/site/layouts/products/single.html
+++ b/site/layouts/section/products.html
diff --git a/site/layouts/section/values.html b/site/layouts/section/values.html
new file mode 100644
index 0000000..9b6fa13
--- /dev/null
+++ b/site/layouts/section/values.html
@@ -0,0 +1,17 @@
+{{ partial "head" . }}
+{{ partial "nav" . }}
+{{ partial "jumbotron" (dict "imageUrl" .Params.image "title" .Title) }}
+
+<div class="mw7 center ph3 pt4">
+
+  {{ range $index, $element := .Params.values }}
+    {{ if modBool $index 2 }}
+      {{ partial "media-block" $element }}
+    {{ else }}
+      {{ partial "media-block-reverse" $element }}
+    {{ end }}
+  {{ end }}
+
+</div>
+
+{{ partial "footer" . }}
diff --git a/site/layouts/values/single.html b/site/layouts/values/single.html
deleted file mode 100644
index 552922a..0000000
--- a/site/layouts/values/single.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{{ partial "head" . }}
-{{ partial "nav" . }}
-{{ partial "jumbotron" (dict "imageUrl" "/img/about/jumbotron.jpg" "title" "Values") }}
-
-<div class="mw7 center ph3 pt4">
-
-  {{ partial "media-block" (dict "heading" "Shade-grown coffee" "text" "Coffee is a small tree or shrub that grows in the forest understory in its wild form, and traditionally was grown commercially under other trees that provided shade. The forest-like structure of shade coffee farms provides habitat for a great number of migratory and resident species." "imageUrl" "/img/about/shade-grown.jpg") }}
-
-  {{ partial "media-block-reverse" (dict "heading" "Single origin" "text" "Single-origin coffee is coffee grown within a single known geographic origin. Sometimes, this is a single farm or a specific collection of beans from a single country. The name of the coffee is then usually the place it was grown to whatever degree available." "imageUrl" "/img/about/single-origin.jpg") }}
-
-  {{ partial "media-block" (dict "heading" "Sustainable farming" "text" "Sustainable agriculture is farming in sustainable ways based on an understanding of ecosystem services, the study of relationships between organisms and their environment. What grows where and how it is grown are a matter of choice and careful consideration for nature and communities." "imageUrl" "/img/about/sustainable-farming.jpg") }}
-
-  {{ partial "media-block-reverse" (dict "heading" "Direct sourcing" "text" "Direct trade is a form of sourcing practiced by some coffee roasters. Advocates of direct trade practices promote direct communication and price negotiation between buyer and farmer, along with systems that encourage and incentivize quality." "imageUrl" "/img/about/direct-sourcing.jpg") }}
-
-  {{ partial "media-block" (dict "heading" "Reinvest profits" "text" "We want to truly empower the communities that bring amazing coffee to you. That’s why we reinvest 20% of our profits into farms, local businesses and schools everywhere our coffee is grown. You can see the communities grow and learn more about coffee farming on our blog." "imageUrl" "/img/about/reinvest-profits.jpg") }}
-</div>
-
-{{ partial "footer" . }}
diff --git a/site/static/admin/config.yml b/site/static/admin/config.yml
index b0df0a3..bf0f03d 100644
--- a/site/static/admin/config.yml
+++ b/site/static/admin/config.yml
@@ -18,13 +18,47 @@ collections: # A list of collections the CMS should be able to edit
   - name: "pages"
     label: "Pages"
     files:
-      - file: "site/content/products.md"
+      - file: "site/content/_index.md"
+        label: "Home Page"
+        name: "home"
+        fields:
+          - {label: Title, name: title, widget: string}
+          - {label: Subtitle, name: subtitle, widget: string}
+          - {label: Image, name: image, widget: image}
+          - {label: "Blurb", name: blurb, widget: object, fields: [
+              {label: "Heading", name: "heading", widget: string},
+              {label: "Text", name: "text", widget: "text"}]}
+          - {label: "Intro", name: intro, widget: object, fields: [
+              {label: "Heading", name: "heading", widget: string},
+              {label: "Text", name: "text", widget: "text"}]}
+          - {label: "Products", name: products, widget: list, fields: [
+              {label: "Image", name: "image", widget: "image"},
+              {label: "Text", name: "text", widget: "text"}]}
+          - {label: "Values", name: "values", widget: "object", fields: [
+              {label: "Heading", name: "heading", widget: string},
+              {label: "Text", name: "text", widget: "text"}]}
+      - file: "site/content/contact/_index.md"
+        label: "Contact Page"
+        name: "contact"
+        fields:
+          - {label: Title, name: title, widget: string}
+          - {label: Logo, name: logo, widget: image}
+          - {label: Body, name: body, widget: markdown}
+          - label: Contact Entries
+            name: contact_entries
+            widget: list
+            fields:
+              - label: Heading
+                name: heading
+                widget: string
+              - label: Text
+                name: text
+                widget: text
+      - file: "site/content/products/_index.md"
         label: "Products Page"
         name: "products"
         fields:
           - {label: Title, name: title, widget: string}
-          - {label: Type, name: type, widget: hidden, default: products}
-          - {label: Page, name: page, widget: hidden, default: "/products.html"}
           - {label: Image, name: image, widget: image}
           - {label: Heading, name: heading, widget: string}
           - {label: Description, name: description, widget: string}
@@ -33,3 +67,16 @@ collections: # A list of collections the CMS should be able to edit
           - {label: Testimonials, name: testimonials, widget: list, fields: [{label: Quote, name: quote, widget: string}, {label: Author, name: author, widget: string}]}
           - {label: Full_image, name: full_image, widget: image}
           - {label: Pricing, name: pricing, widget: object, fields: [{label: Heading, name: heading, widget: string}, {label: Description, name: description, widget: string}, {label: Plans, name: plans, widget: list, fields: [{label: Plan, name: plan, widget: string}, {label: Price, name: price, widget: string}, {label: Description, name: description, widget: string}, {label: Items, name: items, widget: list}]}]}
+      - file: "site/content/values/_index.md"
+        label: "Values Page"
+        name: "values"
+        fields:
+          - {label: Title, name: title, widget: string}
+          - {label: Image, name: image, widget: image}
+          - label: Values
+            name: values
+            widget: list
+            fields:
+              - {label: Heading, name: heading, widget: string}
+              - {label: Text, name: text, widget: text}
+              - {label: Image, name: imageUrl, widget: image}
diff --git a/site/static/img/blog/chemex.jpg b/site/static/blog-chemex.jpg
index 903f68a..903f68a 100755
--- a/site/static/img/blog/chemex.jpg
+++ b/site/static/blog-chemex.jpg
diff --git a/site/static/img/blog/flavor_wheel.jpg b/site/static/blog-flavor_wheel.jpg
index dc2a87d..dc2a87d 100755
--- a/site/static/img/blog/flavor_wheel.jpg
+++ b/site/static/blog-flavor_wheel.jpg
diff --git a/site/static/browserconfig.xml b/site/static/browserconfig.xml
index b3926a3..e8c37ed 100644
--- a/site/static/browserconfig.xml
+++ b/site/static/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>

   <msapplication>

     <tile>

-      <square150x150logo src="/mstile-150x150.png"/>

+      <square150x150logo src="/img/mstile-150x150.png"/>

       <TileColor>#ff4400</TileColor>

     </tile>

   </msapplication>

diff --git a/site/static/img/about/direct-sourcing.jpg b/site/static/img/about-direct-sourcing.jpg
index 0a52cc5..0a52cc5 100755
--- a/site/static/img/about/direct-sourcing.jpg
+++ b/site/static/img/about-direct-sourcing.jpg
diff --git a/site/static/img/about/jumbotron.jpg b/site/static/img/about-jumbotron.jpg
index 6ecc2b2..6ecc2b2 100644
--- a/site/static/img/about/jumbotron.jpg
+++ b/site/static/img/about-jumbotron.jpg
diff --git a/site/static/img/about/reinvest-profits.jpg b/site/static/img/about-reinvest-profits.jpg
index 73bd5d0..73bd5d0 100755
--- a/site/static/img/about/reinvest-profits.jpg
+++ b/site/static/img/about-reinvest-profits.jpg
diff --git a/site/static/img/about/shade-grown.jpg b/site/static/img/about-shade-grown.jpg
index 2f4b502..2f4b502 100755
--- a/site/static/img/about/shade-grown.jpg
+++ b/site/static/img/about-shade-grown.jpg
diff --git a/site/static/img/about/single-origin.jpg b/site/static/img/about-single-origin.jpg
index 78becb3..78becb3 100755
--- a/site/static/img/about/single-origin.jpg
+++ b/site/static/img/about-single-origin.jpg
diff --git a/site/static/img/about/sustainable-farming.jpg b/site/static/img/about-sustainable-farming.jpg
index 54eac24..54eac24 100755
--- a/site/static/img/about/sustainable-farming.jpg
+++ b/site/static/img/about-sustainable-farming.jpg
diff --git a/site/static/android-chrome-192x192.png b/site/static/img/android-chrome-192x192.png
index 79b84dc..79b84dc 100644
--- a/site/static/android-chrome-192x192.png
+++ b/site/static/img/android-chrome-192x192.png
diff --git a/site/static/android-chrome-512x512.png b/site/static/img/android-chrome-512x512.png
index 3c58dda..3c58dda 100644
--- a/site/static/android-chrome-512x512.png
+++ b/site/static/img/android-chrome-512x512.png
diff --git a/site/static/apple-touch-icon.png b/site/static/img/apple-touch-icon.png
index 46afa7c..46afa7c 100644
--- a/site/static/apple-touch-icon.png
+++ b/site/static/img/apple-touch-icon.png
diff --git a/site/static/favicon-16x16.png b/site/static/img/favicon-16x16.png
index 18985a3..18985a3 100644
--- a/site/static/favicon-16x16.png
+++ b/site/static/img/favicon-16x16.png
diff --git a/site/static/favicon-32x32.png b/site/static/img/favicon-32x32.png
index 2d52eff..2d52eff 100644
--- a/site/static/favicon-32x32.png
+++ b/site/static/img/favicon-32x32.png
diff --git a/site/static/favicon.ico b/site/static/img/favicon.ico
index d055e90..d055e90 100644
--- a/site/static/favicon.ico
+++ b/site/static/img/favicon.ico
diff --git a/site/static/img/home/about-section.jpg b/site/static/img/home-about-section.jpg
index 2571ab6..2571ab6 100755
--- a/site/static/img/home/about-section.jpg
+++ b/site/static/img/home-about-section.jpg
diff --git a/site/static/img/home/jumbotron.jpg b/site/static/img/home-jumbotron.jpg
index f02e6d8..f02e6d8 100644
--- a/site/static/img/home/jumbotron.jpg
+++ b/site/static/img/home-jumbotron.jpg
diff --git a/site/static/img/icons/facebook.svg b/site/static/img/icons-facebook.svg
index 2c6edb0..2c6edb0 100644
--- a/site/static/img/icons/facebook.svg
+++ b/site/static/img/icons-facebook.svg
diff --git a/site/static/img/icons/instagram.svg b/site/static/img/icons-instagram.svg
index 8b4f212..8b4f212 100644
--- a/site/static/img/icons/instagram.svg
+++ b/site/static/img/icons-instagram.svg
diff --git a/site/static/img/icons/twitter.svg b/site/static/img/icons-twitter.svg
index 8b04036..8b04036 100644
--- a/site/static/img/icons/twitter.svg
+++ b/site/static/img/icons-twitter.svg
diff --git a/site/static/img/icons/vimeo.svg b/site/static/img/icons-vimeo.svg
index 6ccc7a5..6ccc7a5 100644
--- a/site/static/img/icons/vimeo.svg
+++ b/site/static/img/icons-vimeo.svg
diff --git a/site/static/img/illustrations/coffee-gear.svg b/site/static/img/illustrations-coffee-gear.svg
index 93b797e..93b797e 100644
--- a/site/static/img/illustrations/coffee-gear.svg
+++ b/site/static/img/illustrations-coffee-gear.svg
diff --git a/site/static/img/illustrations/coffee.svg b/site/static/img/illustrations-coffee.svg
index baa46a7..baa46a7 100644
--- a/site/static/img/illustrations/coffee.svg
+++ b/site/static/img/illustrations-coffee.svg
diff --git a/site/static/img/illustrations/meeting-space.svg b/site/static/img/illustrations-meeting-space.svg
index 043eafb..043eafb 100644
--- a/site/static/img/illustrations/meeting-space.svg
+++ b/site/static/img/illustrations-meeting-space.svg
diff --git a/site/static/img/illustrations/tutorials.svg b/site/static/img/illustrations-tutorials.svg
index 64f42a1..64f42a1 100644
--- a/site/static/img/illustrations/tutorials.svg
+++ b/site/static/img/illustrations-tutorials.svg
diff --git a/site/static/mstile-144x144.png b/site/static/img/mstile-144x144.png
index 2787c56..2787c56 100644
--- a/site/static/mstile-144x144.png
+++ b/site/static/img/mstile-144x144.png
diff --git a/site/static/mstile-150x150.png b/site/static/img/mstile-150x150.png
index edfb37f..edfb37f 100644
--- a/site/static/mstile-150x150.png
+++ b/site/static/img/mstile-150x150.png
diff --git a/site/static/mstile-310x150.png b/site/static/img/mstile-310x150.png
index abd262e..abd262e 100644
--- a/site/static/mstile-310x150.png
+++ b/site/static/img/mstile-310x150.png
diff --git a/site/static/mstile-310x310.png b/site/static/img/mstile-310x310.png
index 1873248..1873248 100644
--- a/site/static/mstile-310x310.png
+++ b/site/static/img/mstile-310x310.png
diff --git a/site/static/mstile-70x70.png b/site/static/img/mstile-70x70.png
index ac78c21..ac78c21 100644
--- a/site/static/mstile-70x70.png
+++ b/site/static/img/mstile-70x70.png
diff --git a/site/static/og-image.jpg b/site/static/img/og-image.jpg
index 9d829cf..9d829cf 100644
--- a/site/static/og-image.jpg
+++ b/site/static/img/og-image.jpg
diff --git a/site/static/img/products/products-full-width.jpg b/site/static/img/products-full-width.jpg
index b1a0194..b1a0194 100644
--- a/site/static/img/products/products-full-width.jpg
+++ b/site/static/img/products-full-width.jpg
diff --git a/site/static/img/products/products-grid1.jpg b/site/static/img/products-grid1.jpg
index 600be3c..600be3c 100755
--- a/site/static/img/products/products-grid1.jpg
+++ b/site/static/img/products-grid1.jpg
diff --git a/site/static/img/products/products-grid2.jpg b/site/static/img/products-grid2.jpg
index b066a88..b066a88 100755
--- a/site/static/img/products/products-grid2.jpg
+++ b/site/static/img/products-grid2.jpg
diff --git a/site/static/img/products/products-grid3.jpg b/site/static/img/products-grid3.jpg
index df47e06..df47e06 100755
--- a/site/static/img/products/products-grid3.jpg
+++ b/site/static/img/products-grid3.jpg
diff --git a/site/static/img/products/jumbotron.jpg b/site/static/img/products-jumbotron.jpg
index dfb2dbe..dfb2dbe 100755
--- a/site/static/img/products/jumbotron.jpg
+++ b/site/static/img/products-jumbotron.jpg
diff --git a/site/static/safari-pinned-tab.svg b/site/static/img/safari-pinned-tab.svg
index ac6b23d..ac6b23d 100644
--- a/site/static/safari-pinned-tab.svg
+++ b/site/static/img/safari-pinned-tab.svg
diff --git a/site/static/manifest.json b/site/static/manifest.json
index 80c5526..c488cb2 100644
--- a/site/static/manifest.json
+++ b/site/static/manifest.json
@@ -2,12 +2,12 @@
 	"name": "",
 	"icons": [
 		{
-			"src": "\/android-chrome-192x192.png",
+			"src": "\/img\/android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png"
 		},
 		{
-			"src": "\/android-chrome-512x512.png",
+			"src": "\/img\/android-chrome-512x512.png",
 			"sizes": "512x512",
 			"type": "image\/png"
 		}