diff --git a/_includes/header.html b/_includes/header.html
index 082ebd5..a37be4a 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -15,23 +15,41 @@
             <meta property="jekyll-source" content="https://raw.githubusercontent.com/dpb587/dpb587.me/master/{{ page.path }}" />
         {% endif %}
 
-        <meta property="twitter:site" content="dpb587" />
-        <meta property="twitter:creator" content="dpb587" />
-
         {% if page.description %}
             <meta name="description" content="{{ page.description }}" />
-            <meta property="og:description" content="{{ page.description }}" />
         {% endif %}
 
         {% if page.tags %}
             <meta name="keywords" content="{{ page.tags|join(' ') }}" />
         {% endif %}
 
+        <meta name="viewport" content="width=756" />
+
         <link href="http://dpb587.me{{ page.url|replace:'/index.html','/' }}" rel="canonical" />
+
         <meta property="og:title" content="{% if page.title == 'Home' %}Danny Berger{% else %}{{ page.title }}{% endif %}" />
         <meta property="og:url" content="http://dpb587.me{% if page.url != '/index.html' %}{{ page.url }}{% endif %}?utm_campaign=ref&amp;utm_medium=def&amp;utm_source=opengraph" />
-        <meta property="twitter:url" content="http://dpb587.me{% if page.url != '/index.html' %}{{ page.url }}{% endif %}?utm_campaign=ref&amp;utm_medium=def&amp;utm_source=twitter" />
-        <meta name="viewport" content="width=756" />
+        {% if page.description %}
+            <meta property="og:description" content="{{ page.description }}" />
+        {% endif %}
+
+        <meta name="twitter:domain" content="dpb587.me" />
+        <meta name="twitter:site" content="@dpb587" />
+        <meta name="twitter:creator" content="@dpb587" />
+        <meta name="twitter:url" content="http://dpb587.me{% if page.url != '/index.html' %}{{ page.url }}{% endif %}?utm_campaign=ref&amp;utm_medium=def&amp;utm_source=twitter" />
+        <meta name="twitter:title" content="{% if page.title == 'Home' %}Danny Berger{% else %}{{ page.title }}{% endif %}" />
+        {% if page.description %}
+            <meta name="twitter:description" content="{{ page.description }}" />
+        {% endif %}
+        {% if 'gallery-photo' == page.layout %}
+            <meta name="twitter:card" content="photo" />
+            <meta name="twitter:image:src" content="{{ site.asset_prefix }}{{ page.url|replace:".html","~640.jpg" }}" />
+        {% else %}
+            <meta name="twitter:card" content="summary">
+            {% if page.primary_image %}
+                <meta name="twitter:image:src" content="{{ page.primary_image }}">
+            {% endif %}
+        {% endif %}
 
         <script type="text/javascript">
             var _gaq = _gaq || [];
diff --git a/blog/_posts/2014-04-24-color-searching-with-elasticsearch.md b/blog/_posts/2014-04-24-color-searching-with-elasticsearch.md
index 28ca802..82f2b0c 100644
--- a/blog/_posts/2014-04-24-color-searching-with-elasticsearch.md
+++ b/blog/_posts/2014-04-24-color-searching-with-elasticsearch.md
@@ -3,6 +3,7 @@ title: Color Searching with Elasticsearch
 layout: post
 tags: color ecommerce elasticsearch hsv search weighted
 description: Some mappings, strategies, and queries for advanced color searching with elasticsearch.
+primary_image: http://dpb587.me/asset/blog/2014-04-24-color-searching-with-elasticsearch/search0.png
 ---
 
 A [year ago][1] when I updated the [TLE website][2] I dropped the "search by color" functionality. Originally, all the