diff --git a/themes/simple/templates/open_graph.html b/themes/simple/templates/open_graph.html
index 85288d7..8aeeac2 100644
--- a/themes/simple/templates/open_graph.html
+++ b/themes/simple/templates/open_graph.html
@@ -1,33 +1,56 @@
+<meta property="og:site_name" content="Atention Span History" />
+
 {% if article is defined %}
 
-  <meta property="og:type" content="article" />
-  <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}" />
   <meta property="og:title" content="{{ article.title | replace("\"", "&quot;") }}" />
+  <meta property="og:type" content="article" />
   <meta property="og:description" content="{{ article.content | striptags | replace("\"", "&quot;") | truncate(196, False, '...') }}" />
-  <meta property="twitter:title" content="{{ article.title | replace("\"", "&quot;") }}" />
-  <meta property="twitter:card" content="summary" />
-  <meta property="twitter:description" content="{{ article.content | striptags | replace("\"", "&quot;") | truncate(196, False, '...') }}" />
+  <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}" />
+  <meta property="og:image" content="{{ SITEURL }}/images/trent.jpg" />
+  {% if article.date %}
+  <meta property="article:published_time" content="{{ article.date.isoformat() }}" />
+  {% if article.modified %}
+  <meta property="article:modified_time" content="{{ article.modified.isoformat() }}" />
+  {% else %}
+  <meta property="article:modified_time" content="{{ article.date.isoformat() }}" />
+  {% endif %}
+  {% endif %}
+
+  <meta name="twitter:card" content="summary" />
+  <meta name="twitter:title" content="{{ article.title | replace("\"", "&quot;") }}" />
+  <meta name="twitter:description" content="{{ article.content | striptags | replace("\"", "&quot;") | truncate(196, False, '...') }}" />
+  <meta name="twitter:url" content="{{ SITEURL }}/{{ article.url }}" />
+  <meta name="twitter:label1" content="Written by" />
+  <meta name="twitter:data1" content="Trent Palmer" />
 
 {% elif page is defined %}
 
-  <meta property="og:type" content="website" />
-  <meta property="og:url" content="{{ SITEURL }}/{{ page.url }}" />
   <meta property="og:title" content="{{ SITENAME }} - {{ page.title | replace("\"", "&quot;") }}" />
+  <meta property="og:type" content="website" />
   <meta property="og:description" content="{{ page.content | striptags | replace("\"", "&quot;") | truncate(196, False, '...') }}" />
-  <meta property="twitter:title" content="{{ SITENAME }} - {{ page.title | replace("\"", "&quot;") }}" />
-  <meta property="twitter:card" content="summary" />
-  <meta property="twitter:description" content="{{ page.content | striptags | replace("\"", "&quot;") | truncate(196, False, '...') }}" />
+  <meta property="og:url" content="{{ SITEURL }}/{{ page.url }}" />
+  <meta property="og:image" content="{{ SITEURL }}/images/trent.jpg" />
+
+  <meta name="twitter:card" content="summary" />
+  <meta name="twitter:title" content="{{ SITENAME }} - {{ page.title | replace("\"", "&quot;") }}" />
+  <meta name="twitter:description" content="{{ page.content | striptags | replace("\"", "&quot;") | truncate(196, False, '...') }}" />
+  <meta name="twitter:url" content="{{ SITEURL }}/{{ page.url }}" />
 
 {% else %}
 
-  <meta property="og:type" content="website" />
-  <meta property="og:url" content="{{ SITEURL }}/{{ output_file }}" />
   <meta property="og:title" content="{{ SITENAME }}" />
+  <meta property="og:type" content="website" />
   <meta property="og:description" content="A page on Attention Span History" />
-  <meta property="twitter:title" content="{{ SITENAME }}" />
-  <meta property="twitter:card" content="summary" />
-  <meta property="twitter:description" content="A page on Attention Span History" />
+  <meta property="og:url" content="{{ SITEURL }}/{{ output_file }}" />
+  <meta property="og:image" content="{{ SITEURL }}/images/trent.jpg" />
+
+  <meta name="twitter:card" content="summary" />
+  <meta name="twitter:title" content="{{ SITENAME }}" />
+  <meta name="twitter:description" content="A page on Attention Span History" />
+  <meta name="twitter:url" content="{{ SITEURL }}/{{ output_file }}" />
 
 {% endif %}
 
-<meta property="og:image" content="{{ SITEURL }}/images/trent.jpg" />
+<meta name="twitter:site" content="@BoringTrent" />
+<meta name="twitter:creator" content="@BoringTrent" />
+<meta name="twitter:image" content="{{ SITEURL }}/images/trent.jpg" />