diff --git a/pelicanconf.py b/pelicanconf.py
index 9029a01..aa82ec0 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -4,8 +4,8 @@ from __future__ import unicode_literals
 AUTHOR = 'marvin'
 SITENAME = 'xsteadfastx'
 SITEURL = ''
-SITELOGO = SITEURL + '/theme/img/avatar.png'
-FAVICON = SITEURL + '/theme/img/favicon.png'
+SITELOGO = '/theme/img/avatar.png'
+FAVICON = '/theme/img/favicon.png'
 TIMEZONE = "Europe/Berlin"
 DESCRIPTION = "the cats are not what they seem"
 
@@ -13,7 +13,7 @@ DESCRIPTION = "the cats are not what they seem"
 RELATIVE_URLS = True
 
 GITHUB_URL = 'http://github.com/xsteadfastx/'
-TWITTER_NAME = 'xsteadfastx'
+TWITTER_NAME = '@xsteadfastx'
 FLATTR_USER = 'xsteadfastx'
 PDF_GENERATOR = False
 REVERSE_CATEGORY_ORDER = True
diff --git a/themes/flex/templates/article.html b/themes/flex/templates/article.html
index e6e8d52..dfe56d3 100644
--- a/themes/flex/templates/article.html
+++ b/themes/flex/templates/article.html
@@ -1,10 +1,11 @@
 {% extends "base.html" %}
 
 {% block meta %}
-<meta name="author" content="{{ article.author.name }}" />
-<meta name="description" content="{{ article.summary|striptags }}" />
-<meta name="keywords" content="{{ article.tags|join(', ') }}">
-{% include "partial/og_article.html" %}
+  <meta name="author" content="{{ article.author.name }}" />
+  <meta name="description" content="{{ article.summary|striptags|e }}" />
+  <meta name="keywords" content="{{ article.tags|join(', ') }}">
+  {% include "partial/og_article.html" %}
+  {% include "partial/twittercards.html" %}
 {% endblock %}
 
 {% block title %} &ndash; {{ article.title }}{% endblock %}
diff --git a/themes/flex/templates/base.html b/themes/flex/templates/base.html
index 5a5f227..10f5ae8 100644
--- a/themes/flex/templates/base.html
+++ b/themes/flex/templates/base.html
@@ -22,8 +22,8 @@
   <link href="{{ FEED_DOMAIN }}/{{ FEED_ALL_RSS }}" type="application/rss+xml" rel="alternate" title="{{ SITENAME }} RSS">
   {% endif %}
   {% if FAVICON %}
-  <link rel="shortcut icon" href="{{ FAVICON }}" type="image/x-icon">
-  <link rel="icon" href="{{ FAVICON }}" type="image/x-icon">
+  <link rel="shortcut icon" href="{{ SITEURL }}{{ FAVICON }}" type="image/x-icon">
+  <link rel="icon" href="{{ SITEURL }}{{ FAVICON }}" type="image/x-icon">
   {% endif %}
 
   <meta charset="utf-8" />
diff --git a/themes/flex/templates/partial/og.html b/themes/flex/templates/partial/og.html
index 41e0c8c..eb8b5b6 100644
--- a/themes/flex/templates/partial/og.html
+++ b/themes/flex/templates/partial/og.html
@@ -1,14 +1,14 @@
-{% if OG_LOCALE %}
-  {% set default_locale = OG_LOCALE %}
-{% else %}
-  {% set default_locale = 'en_US' %}
-{% endif %}
-<meta property="og:site_name" content="{{ SITENAME }}"/>
-<meta property="og:type" content="blog"/>
-<meta property="og:title" content="{{ SITENAME }}"/>
-<meta property="og:description" content="{{ SITEDESCRIPTION }}"/>
-<meta property="og:locale" content="{{ default_locale }}"/>
-<meta property="og:url" content="{{ SITEURL }}"/>
-{% if SITELOGO %}
-<meta property="og:image" content="{{ SITELOGO }}">
-{% endif %}
+  {% if OG_LOCALE %}
+    {% set default_locale = OG_LOCALE %}
+  {% else %}
+    {% set default_locale = 'en_US' %}
+  {% endif %}
+  <meta property="og:site_name" content="{{ SITENAME }}"/>
+  <meta property="og:type" content="blog"/>
+  <meta property="og:title" content="{{ SITENAME }}"/>
+  <meta property="og:description" content="{{ SITEDESCRIPTION }}"/>
+  <meta property="og:locale" content="{{ default_locale }}"/>
+  <meta property="og:url" content="{{ SITEURL }}"/>
+  {% if SITELOGO %}
+  <meta property="og:image" content="{{ SITEURL }}{{ SITELOGO }}">
+  {% endif %}
diff --git a/themes/flex/templates/partial/og_article.html b/themes/flex/templates/partial/og_article.html
index 50d4df3..ed9fbb1 100644
--- a/themes/flex/templates/partial/og_article.html
+++ b/themes/flex/templates/partial/og_article.html
@@ -1,19 +1,19 @@
-{% if OG_LOCALE %}
-  {% set default_locale = OG_LOCALE %}
-{% else %}
-  {% set default_locale = 'en_US' %}
-{% endif %}
-<meta property="og:site_name" content="{{ SITENAME }}"/>
-<meta property="og:title" content="{{ article.title }}"/>
-<meta property="og:description" content="{{ article.summary|striptags }}"/>
-<meta property="og:locale" content="{{ article.metadata.get('og_locale', default_locale) }}"/>
-<meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/>
-<meta property="og:type" content="article"/>
-<meta property="article:published_time" content="{{ article.date }}"/>
-<meta property="article:modified_time" content="{{ article.modified }}"/>
-<meta property="article:author" content="{{ SITEURL }}/{{ article.author.url }}">
-<meta property="article:section" content="{{ article.category.name }}"/>
-{% for tag in article.tags %}
-<meta property="article:tag" content="{{ tag.name }}"/>
-{% endfor %}
-<meta property="og:image" content="{{ article.metadata.get('cover', SITELOGO) }}">
+  {% if OG_LOCALE %}
+    {% set default_locale = OG_LOCALE %}
+  {% else %}
+    {% set default_locale = 'en_US' %}
+  {% endif %}
+  <meta property="og:site_name" content="{{ SITENAME }}"/>
+  <meta property="og:title" content="{{ article.title }}"/>
+  <meta property="og:description" content="{{ article.summary|striptags|e }}"/>
+  <meta property="og:locale" content="{{ article.metadata.get('og_locale', default_locale) }}"/>
+  <meta property="og:url" content="{{ SITEURL }}/{{ article.url }}"/>
+  <meta property="og:type" content="article"/>
+  <meta property="article:published_time" content="{{ article.date }}"/>
+  <meta property="article:modified_time" content="{{ article.modified }}"/>
+  <meta property="article:author" content="{{ SITEURL }}/{{ article.author.url }}">
+  <meta property="article:section" content="{{ article.category.name }}"/>
+  {% for tag in article.tags %}
+  <meta property="article:tag" content="{{ tag.name }}"/>
+  {% endfor %}
+  <meta property="og:image" content="{{ SITEURL }}{{ article.metadata.get('cover', SITELOGO) }}">
diff --git a/themes/flex/templates/partial/twittercards.html b/themes/flex/templates/partial/twittercards.html
new file mode 100644
index 0000000..bd15c85
--- /dev/null
+++ b/themes/flex/templates/partial/twittercards.html
@@ -0,0 +1,10 @@
+
+  {% if TWITTER_NAME %}
+  <meta name="twitter:card" content="summary">
+  <meta name="twitter:site" content="{{ TWITTER_NAME }}">
+  <meta name="twitter:creator" content="{{ TWITTER_NAME }}">
+  <meta name="twitter:title" content="{{ article.title }}">
+  <meta name="twitter:url" content="{{ SITEURL }}/{{ article.url }}">
+  <meta name="twitter:image" content="{{ SITEURL }}{{ SITELOGO }}">
+  <meta name="twitter:description" content="{{ article.summary|striptags|e }}">
+  {% endif %}