diff --git a/_includes/share.html b/_includes/share.html
index 5dca128..c6445b0 100644
--- a/_includes/share.html
+++ b/_includes/share.html
@@ -1,21 +1,22 @@
 <div>
 {% if site.fb-share %}
-<div style="float:left; padding: 0 5px; vertical-align:top">
-<div class="fb-share-button" data-href="{{ site.url }}{{ page.url }}" data-layout="button_count"></div>
-</div>
+  <div style="float:left; padding: 0 5px; vertical-align:top">
+    <div class="fb-share-button" data-href="{{ site.url }}{{ page.url }}" data-layout="button_count"></div>
+  </div>
 {% endif %}
+
 {% if site.twitter-share %}
-<div style="float:left; padding: 0 5px; vertical-align:top">
-  <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-text="{{ page.title }}"></a>
+  <div style="float:left; padding: 0 5px; vertical-align:top">
+    <a href="https://twitter.com/share" class="twitter-share-button" data-url="{{ site.url }}{{ page.url }}" data-text="{{ page.title }} {% for tag in page.tags%}#{{ tag }} {% endfor %}"></a>
 </div>
 {% endif %}
+
 {% if site.reddit-share %}
-<div style="float:left; padding: 0 5px; vertical-align:top">
-  <script type="text/javascript">reddit_newwindow='1'</script>
-  <script type="text/javascript">reddit_target='technology'</script>
-  <script type="text/javascript">reddit_title='{{ page.title }}'</script>
-  <script type="text/javascript">reddit_url='{{ site.url }}/{{ page.url }}'</script>
-  <script type="text/javascript" src="//www.redditstatic.com/button/button1.js"></script>
-</div>
+  <div style="float:left; padding: 0 5px; vertical-align:top">
+    <script type="text/javascript">reddit_newwindow='1'</script>
+    <script type="text/javascript">reddit_title='{{ page.title }}'</script>
+    <script type="text/javascript">reddit_url='{{ site.url }}/{{ page.url }}'</script>
+    <script type="text/javascript" src="//www.redditstatic.com/button/button1.js"></script>
+  </div>
 {% endif %}
 </div>