diff --git a/config.toml b/config.toml
index d3ef6a1ca50..b2da575bfab 100644
--- a/config.toml
+++ b/config.toml
@@ -2,7 +2,8 @@ theme = "devopsdays-legacy"
 baseurl = "http://devopsdays.github.io/"
 # baseurl = "http://localhost:1313/"
 languageCode = "en-us"
-title = "devopsdays"
+GoogleAnalytics = "UA-9713393-1"
+title = "DevOpsDays"
 canonifyurls = false
 dataDir = "data"
 archetypedir = "archetypes"
@@ -13,17 +14,7 @@ PaginatePath = "blog"
   blog = "/blog/:year/:month/:day/:title/"
 
 [params]
-Facebook = "//www.facebook.com/group.php?gid=106761636771"
-GATracker = ""
-Twitter = "//www.twitter.com/devopsdays"
-	[params.social]
-		github = "arresteddevops"
-		facebook = "Arresteddevops"
-		facebook_admin = "500557137"  # This needs to be a page admin to get domain insights
-		twitter = "devopsdays"
-		twitter_domain = "devopsdays.org" # This domain shows in twitter cards as "View on `twitter_domain`"
-		googleplus = ""
-		pinterest = ""
-		instagram = ""
-		youtube = ""
-		linkedin = "nozzleio"
+	Facebook = "//www.facebook.com/group.php?gid=106761636771"
+	Twitter = "http://www.twitter.com/devopsdays"
+	Linkedin = "http://www.linkedin.com/groups?home=&gid=2445279"
+	Groups = "http://groups.google.com/group/devopsdays"
diff --git a/themes/devopsdays-legacy/layouts/_default/single.html b/themes/devopsdays-legacy/layouts/_default/single.html
index a54bf66bfa6..9929a0ee010 100644
--- a/themes/devopsdays-legacy/layouts/_default/single.html
+++ b/themes/devopsdays-legacy/layouts/_default/single.html
@@ -1,82 +1,47 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" >
-<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/" >
-
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">google.load('jquery', '1.3.2');</script>
-
-<!---This is a combined jAmpersand, jqwindont , jPullquote -->
-<script type="text/javascript" src="/js/devops.js"></script>
-
-<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
-<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
-<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
-<!--[if IE]>
-<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
-<![endif]-->
+  {{ partial "html_head.html" . }}
 </head>
 
-
 <body>
-<div class="container ">
-<div class="span-24 last" id="header">
+<div class="container">
   {{ partial "header.html" . }}
-</div>
-
-<div class="span-24 last">
-  {{ partial "headermenu.html" . }}
-</div>
 
-<div class="span-24 last" id="header">
-<div class="span-15 first">
-  <h1>{{ .Title }}</h1>
-</div>
-
-<div class="span-8 last">
-  {{ partial "buttons.html" . }}
-</div>
-</div>
-
-<div class="span-15  ">
-  <div class="span-15  last ">
-   {{ .Content }}
+  <div class="span-24">
+    {{ partial "header_menu.html" . }}
   </div>
-</div>
 
-<div class="span-8 last">
-  <div class="span-8 last">
-    {{ partial "twitterfeed.html" . }}
+  <div class="span-15">
+    <h1>{{ .Title }}</h1>
   </div>
-</div>
-<div class="span-18 ">
-  <div style=" padding-top:18px;" class="span-8 last">
-    <h1>Past </h1>
+  <div class="span-8 last">
+    {{ partial "buttons.html" . }}
   </div>
 
-  <div class="span-18 ">
-    {{ partial "past.html" . }}
+  <div class="span-15">
+     {{ .Content }}
+  </div>
+  <div class="span-8 last">
+      {{ partial "twitterfeed.html" . }}
   </div>
 
-</div>
-
-<div class="span-5 last ">
-  <div style=" padding-top:18px;" class="span-4 last">
-    <h1>Future </h1>
+  <div style="padding-top:18px;" class="span-18">
+    <h1>Past</h1>
+  </div>
+  <div style="padding-top:18px;" class="span-5 last">
+    <h1>Future</h1>
   </div>
 
+  <div class="span-18">
+    {{ partial "past.html" . }}
+  </div>
   <div class="span-5 last">
     {{ partial "future.html" . }}
   </div>
-
-</div>
 </div>
 
-
 {{ partial "googleanalytics.html" . }}
-{{ partial "footer.html" . }}
 
 </body>
 </html>
diff --git a/themes/devopsdays-legacy/layouts/blog/single.html b/themes/devopsdays-legacy/layouts/blog/single.html
deleted file mode 100644
index a54bf66bfa6..00000000000
--- a/themes/devopsdays-legacy/layouts/blog/single.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" >
-<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/" >
-
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">google.load('jquery', '1.3.2');</script>
-
-<!---This is a combined jAmpersand, jqwindont , jPullquote -->
-<script type="text/javascript" src="/js/devops.js"></script>
-
-<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
-<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
-<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
-<!--[if IE]>
-<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
-<![endif]-->
-</head>
-
-
-<body>
-<div class="container ">
-<div class="span-24 last" id="header">
-  {{ partial "header.html" . }}
-</div>
-
-<div class="span-24 last">
-  {{ partial "headermenu.html" . }}
-</div>
-
-<div class="span-24 last" id="header">
-<div class="span-15 first">
-  <h1>{{ .Title }}</h1>
-</div>
-
-<div class="span-8 last">
-  {{ partial "buttons.html" . }}
-</div>
-</div>
-
-<div class="span-15  ">
-  <div class="span-15  last ">
-   {{ .Content }}
-  </div>
-</div>
-
-<div class="span-8 last">
-  <div class="span-8 last">
-    {{ partial "twitterfeed.html" . }}
-  </div>
-</div>
-<div class="span-18 ">
-  <div style=" padding-top:18px;" class="span-8 last">
-    <h1>Past </h1>
-  </div>
-
-  <div class="span-18 ">
-    {{ partial "past.html" . }}
-  </div>
-
-</div>
-
-<div class="span-5 last ">
-  <div style=" padding-top:18px;" class="span-4 last">
-    <h1>Future </h1>
-  </div>
-
-  <div class="span-5 last">
-    {{ partial "future.html" . }}
-  </div>
-
-</div>
-</div>
-
-
-{{ partial "googleanalytics.html" . }}
-{{ partial "footer.html" . }}
-
-</body>
-</html>
diff --git a/themes/devopsdays-legacy/layouts/index.html b/themes/devopsdays-legacy/layouts/index.html
index 0de443ade82..7134c92eb12 100644
--- a/themes/devopsdays-legacy/layouts/index.html
+++ b/themes/devopsdays-legacy/layouts/index.html
@@ -1,83 +1,48 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" >
-<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/" >
-
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">google.load('jquery', '1.3.2');</script>
-
-<!---This is a combined jAmpersand, jqwindont , jPullquote -->
-<script type="text/javascript" src="/js/devops.js"></script>
-
-<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
-<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
-<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
-<!--[if IE]>
-<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
-<![endif]-->
+  {{ partial "html_head.html" . }}
 </head>
 
-
-<body onload="initialize()">
-<div class="container ">
-<div class="span-24 last" id="header">
+<body>
+<div class="container">
   {{ partial "header.html" . }}
-</div>
-
-<div class="span-24 last">
-  {{ partial "headermenu.html" . }}
-</div>
 
-<div class="span-24 last" id="header">
-<div class="span-15 first">
-  <h1>Upcoming devopsdays events</h1>
-</div>
-
-<div class="span-8 last">
-  {{ partial "buttons.html" . }}
-</div>
-</div>
-
-<div class="span-15  ">
-  <div class="span-15  last ">
-   {{ partial "upcoming_headline.html" . }}
-   {{ partial "map.html" .}}
+  <div class="span-24">
+    {{ partial "header_menu.html" . }}
   </div>
-</div>
 
-<div class="span-8 last">
-  <div class="span-8 last">
-    {{ partial "twitterfeed.html" . }}
+  <div class="span-15">
+    <h1>Upcoming devopsdays events</h1>
   </div>
-</div>
-<div class="span-18 ">
-  <div style=" padding-top:18px;" class="span-8 last">
-    <h1>Past </h1>
+  <div class="span-8 last">
+    {{ partial "buttons.html" . }}
   </div>
 
-  <div class="span-18 ">
-    {{ partial "past.html" . }}
+  <div class="span-15">
+     {{ partial "upcoming_headline.html" . }}
+     {{ partial "map.html" .}}
+  </div>
+  <div class="span-8 last">
+      {{ partial "twitterfeed.html" . }}
   </div>
 
-</div>
-
-<div class="span-5 last ">
-  <div style=" padding-top:18px;" class="span-4 last">
-    <h1>Future </h1>
+  <div style="padding-top:18px;" class="span-18">
+    <h1>Past</h1>
+  </div>
+  <div style="padding-top:18px;" class="span-5 last">
+    <h1>Future</h1>
   </div>
 
+  <div class="span-18">
+    {{ partial "past.html" . }}
+  </div>
   <div class="span-5 last">
     {{ partial "future.html" . }}
   </div>
-
-</div>
 </div>
 
-
 {{ partial "googleanalytics.html" . }}
-{{ partial "footer.html" . }}
 
 </body>
 </html>
diff --git a/themes/devopsdays-legacy/layouts/partials/buttons.html b/themes/devopsdays-legacy/layouts/partials/buttons.html
index 9ee61e052d7..a06823d9c08 100644
--- a/themes/devopsdays-legacy/layouts/partials/buttons.html
+++ b/themes/devopsdays-legacy/layouts/partials/buttons.html
@@ -1,7 +1,7 @@
 <div>
   <a href="/feed"><img width="32px" height="32px" alt="rss" title="rss feed" src="/images/feed.png"></a>
-  <a href="http://www.twitter.com/devopsdays"><img width="32px" height="32px" alt="twitter" title="twitter" src="/images/twitter.png"></a>
-  <a href="http://groups.google.com/group/devopsdays"><img width="32px" height="32px" alt="mail" title="mailinglist" src="/images/email.png"></a>
-  <a href="http://www.facebook.com/group.php?gid=106761636771"><img width="32px" height="32px" alt="mail" title="facebook" src="/images/facebook.png"></a>
-  <a href="http://www.linkedin.com/groups?home=&gid=2445279"><img width="32px" height="32px" alt="mail" title="linkedin" src="/images/linkedin.png"></a>
+  <a href="{{ .Site.Params.Twitter }}"><img width="32px" height="32px" alt="twitter" title="twitter" src="/images/twitter.png"></a>
+  <a href="{{ .Site.Params.Groups }}"><img width="32px" height="32px" alt="mail" title="mailinglist" src="/images/email.png"></a>
+  <a href="{{ .Site.Params.Facebook }}"><img width="32px" height="32px" alt="mail" title="facebook" src="/images/facebook.png"></a>
+  <a href="{{ .Site.Params.Linkedin }}"><img width="32px" height="32px" alt="mail" title="linkedin" src="/images/linkedin.png"></a>
 </div>
diff --git a/themes/devopsdays-legacy/layouts/partials/footer.html b/themes/devopsdays-legacy/layouts/partials/footer.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/themes/devopsdays-legacy/layouts/partials/googleanalytics.html b/themes/devopsdays-legacy/layouts/partials/googleanalytics.html
index 69449f19fe1..c59fc8b52c2 100644
--- a/themes/devopsdays-legacy/layouts/partials/googleanalytics.html
+++ b/themes/devopsdays-legacy/layouts/partials/googleanalytics.html
@@ -1,6 +1,6 @@
 <script type="text/javascript">
   var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', 'UA-9713393-1']);
+  _gaq.push(['_setAccount', '{{ .Site.GoogleAnalytics }}']);
   _gaq.push(['_trackPageview']);
 
   (function() {
diff --git a/themes/devopsdays-legacy/layouts/partials/header.html b/themes/devopsdays-legacy/layouts/partials/header.html
index 3b5ce23a465..414e42dd45f 100644
--- a/themes/devopsdays-legacy/layouts/partials/header.html
+++ b/themes/devopsdays-legacy/layouts/partials/header.html
@@ -1,5 +1,3 @@
-<div class="span-16 first">
-  <img src="/images/devopsdays-banner.png" title="devopsdays banner" width="801" height="115" alt="devopdays banner" ><br>
-</div>
-<div class="span-8 last">
+<div class="span-24">
+  <img src="/images/devopsdays-banner.png" title="devopsdays banner" width="801" height="115" alt="devopdays banner">
 </div>
diff --git a/themes/devopsdays-legacy/layouts/partials/headermenu.html b/themes/devopsdays-legacy/layouts/partials/header_menu.html
similarity index 100%
rename from themes/devopsdays-legacy/layouts/partials/headermenu.html
rename to themes/devopsdays-legacy/layouts/partials/header_menu.html
diff --git a/themes/devopsdays-legacy/layouts/partials/html_head.html b/themes/devopsdays-legacy/layouts/partials/html_head.html
new file mode 100644
index 00000000000..385868174c1
--- /dev/null
+++ b/themes/devopsdays-legacy/layouts/partials/html_head.html
@@ -0,0 +1,15 @@
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/">
+
+<script type="text/javascript" src="https://www.google.com/jsapi"></script>
+<script type="text/javascript">google.load('jquery', '1.3.2');</script>
+
+<!---This is a combined jAmpersand, jqwindont , jPullquote -->
+<script type="text/javascript" src="/js/devops.js"></script>
+
+<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
+<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
+<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
+<!--[if IE]>
+<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
+<![endif]-->
diff --git a/themes/devopsdays-legacy/layouts/partials/map.html b/themes/devopsdays-legacy/layouts/partials/map.html
index 93760fd8cea..225a0897f6f 100644
--- a/themes/devopsdays-legacy/layouts/partials/map.html
+++ b/themes/devopsdays-legacy/layouts/partials/map.html
@@ -6,10 +6,60 @@
   - http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerwithlabel/1.1/examples/basic.html
 -->
 <link href="/css/googlemaps.css" rel="stylesheet">
+<script type="text/javascript" language="javascript">
+function initialize() {
+    var map;
+    var bounds = new google.maps.LatLngBounds();
+    var mapOptions = {
+        mapTypeId: 'roadmap'
+    };
+
+    // Display a map on the page
+    map = new google.maps.Map(document.getElementById("map_canvas"), mapOptions);
+    map.setTilt(45);
+
+    // Add upcoming events here
+    // Get Latitude and Longitude of a Point: http://itouchmap.com/latlong.html
+    var markers = [
+      {{ range $.Site.Data.events }}
+        {{ if eq .status "current" }}
+          ['{{ .city}}', {{ .coordinates | safeJS }}, '{{ .startdate }}'],
+        {{ end }}
+      {{ end }}
+    ];
+
+    // Display multiple markers on a map
+    var infoWindow = new google.maps.InfoWindow(), marker, i;
+
+    // Loop through our array of markers & place each one on the map
+    for( i = 0; i < markers.length; i++ ) {
+        var position = new google.maps.LatLng(markers[i][1], markers[i][2]);
+        bounds.extend(position);
+        marker = new MarkerWithLabel({
+            position: position,
+            map: map,
+            labelContent: markers[i][0] + "<br>" + markers[i][3],
+            labelAnchor: new google.maps.Point(25, 50),
+            labelClass: "labels",
+            labelStyle: { opacity: 1 }
+        });
+
+        // refocus
+        map.fitBounds(bounds);
+    }
+}
+</script>
+
+<script type="text/javascript" language="javascript">
+      window.onload = function()
+      {
+          initialize();
+      };
+</script>
 
 <script type="text/javascript" src="http://maps.google.com/maps/api/js?key=AIzaSyC1bvNK9qFJGEhoWNbQuojmJJ1Tg0DoOew&sensor=false"></script>
 <script type="text/javascript" src="/js/googlemaps_label.js"></script>
-<script type="text/javascript" src="/js/googlemaps_content.js"></script>
+<!-- <script type="text/javascript" src="/js/googlemaps_content.js"></script> -->
 
 <div id="map_canvas" style="width: 550px; height: 265px"></div>
 <br>
diff --git a/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html b/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html
index 25293d6163d..5c7e3f9162c 100644
--- a/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html
+++ b/themes/devopsdays-legacy/layouts/partials/upcoming_headline.html
@@ -1,34 +1,14 @@
 <div class="submenu" style="width:550px">
   <h3>
-    <a href="/events/2016-vancouver/">
-     Vancouver
-    </a>
-    -
-    <a href="/events/2016-london/">
-     London
-    </a>
-    -
-    <a href="/events/2016-denver/">
-     Denver
-    </a>
-    -
-    <a href="/events/2016-kiel/">
-      Kiel
-    </a>
-    <br>
-    <a href="/events/2016-seattle">
-      Seattle
-    </a>
-	-
-    <a href="/events/2016-toronto">
-      Toronto
-    </a>
-    -
-    <a href="/events/2016-washington-dc">
-      Washington, DC
-    </a>
-    -
-    <a href="/events/2016-minneapolis">
-      Minneapolis
+  {{ range $.Site.Data.events }}
+    {{ if eq .status "current" }}
+      {{ $.Scratch.Add "events" "<a href = '/events/" }}
+      {{ $.Scratch.Add "events" .friendly }}
+      {{ $.Scratch.Add "events" "/welcome'>" }}
+      {{ $.Scratch.Add "events" .city }}
+      {{ $.Scratch.Add "events" "</a> - " }}
+    {{ end }}
+  {{ end }}
+  {{ substr ($.Scratch.Get "events") 0 -3 | safeHTML }}
   </h3>
 </div>
diff --git a/themes/devopsdays-legacy/layouts/section/blog.html b/themes/devopsdays-legacy/layouts/section/blog.html
index 01488982db9..28883976886 100644
--- a/themes/devopsdays-legacy/layouts/section/blog.html
+++ b/themes/devopsdays-legacy/layouts/section/blog.html
@@ -1,85 +1,50 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<meta http-equiv="content-type" content="text/html; charset=utf-8" >
-<link rel="alternate" type="application/rss+xml" title="devopsdays RSS Feed" href="http://www.devopsdays.org/feed/" >
-
-<script type="text/javascript" src="https://www.google.com/jsapi"></script>
-<script type="text/javascript">google.load('jquery', '1.3.2');</script>
-
-<!---This is a combined jAmpersand, jqwindont , jPullquote -->
-<script type="text/javascript" src="/js/devops.js"></script>
-
-<!--- Blueprint CSS Framework Screen + Fancytype-Screen + jedi.css -->
-<link rel="stylesheet" href="/css/devops.min.css" type="text/css" media="screen, projection">
-<link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print">
-<!--[if IE]>
-<link rel="stylesheet" href="/css/blueprint/ie.css" type="text/css" media="screen, projection">
-<![endif]-->
+  {{ partial "html_head.html" . }}
 </head>
 
-
-<body onload="initialize()">
-<div class="container ">
-<div class="span-24 last" id="header">
+<body>
+<div class="container">
   {{ partial "header.html" . }}
-</div>
-
-<div class="span-24 last">
-  {{ partial "headermenu.html" . }}
-</div>
 
-<div class="span-24 last" id="header">
-<div class="span-15 first">
-  <h1>Blog posts</h1>
-</div>
+  <div class="span-24">
+    {{ partial "header_menu.html" . }}
+  </div>
 
-<div class="span-8 last">
-  {{ partial "buttons.html" . }}
-</div>
-</div>
+  <div class="span-15">
+    <h1>Blog Posts</h1>
+  </div>
+  <div class="span-8 last">
+    {{ partial "buttons.html" . }}
+  </div>
 
-<div class="span-15">
-  <div class="span-15 last">
+  <div class="span-15">
     {{ range .Paginator.Pages }}
-        {{ .Render "summary"}}
+       {{ .Render "summary"}}
     {{ end }}
     {{ partial "blog_pagination.html" . }}
   </div>
-</div>
-
-<div class="span-8 last">
   <div class="span-8 last">
-    {{ partial "twitterfeed.html" . }}
-  </div>
-</div>
-<div class="span-18 ">
-  <div style=" padding-top:18px;" class="span-8 last">
-    <h1>Past </h1>
+      {{ partial "twitterfeed.html" . }}
   </div>
 
-  <div class="span-18 ">
-    {{ partial "past.html" . }}
+  <div style="padding-top:18px;" class="span-18">
+    <h1>Past</h1>
   </div>
-
-</div>
-
-<div class="span-5 last ">
-  <div style=" padding-top:18px;" class="span-4 last">
-    <h1>Future </h1>
+  <div style="padding-top:18px;" class="span-5 last">
+    <h1>Future</h1>
   </div>
 
+  <div class="span-18">
+    {{ partial "past.html" . }}
+  </div>
   <div class="span-5 last">
     {{ partial "future.html" . }}
   </div>
-
-</div>
 </div>
 
-
 {{ partial "googleanalytics.html" . }}
-{{ partial "footer.html" . }}
 
 </body>
 </html>
