diff --git a/config/_default/menus.toml b/config/_default/menus.toml
index 2fc9068..b7e185f 100644
--- a/config/_default/menus.toml
+++ b/config/_default/menus.toml
@@ -1,3 +1,5 @@
+### navbar
+
 [[navbar]]
 	name = "About"
 	identifier = "about"
@@ -67,3 +69,25 @@
 	identifier = "ready"
 	url = "/ready/"
 	weight = -700
+
+### social
+[[social]]
+	name = "Twitter"
+	pre = "fab fa-twitter"
+	url = "https://twitter.com/OpenPOWERorg"
+	weight = -2000
+[[social]]
+	name = "Facebook"
+	pre = "fab fa-facebook"
+	url = "https://www.facebook.com/openpower"
+	weight = -1900
+[[social]]
+	name = "LinkedIN"
+	pre = "fab fa-linkedin-in"
+	url = "https://www.linkedin.com/company/openpower-foundation/?viewAsMember=true"
+	weight = -1800
+[[social]]
+	name = "YouTube"
+	pre = "fab fa-youtube"
+	url = "https://www.youtube.com/channel/UCNVcHm09eXVbvUzZkQs0_Sg"
+	weight = -1700
diff --git a/themes/openpowerfoundation/layouts/partials/footer.html b/themes/openpowerfoundation/layouts/partials/footer.html
index f71f6ba..41f7ad9 100644
--- a/themes/openpowerfoundation/layouts/partials/footer.html
+++ b/themes/openpowerfoundation/layouts/partials/footer.html
@@ -1,42 +1,43 @@
 <footer class="footer">
-	<div class="container">
-		<div class="row">
-			<div class="col-md-4">
-				<div class="footer__info">
-					<h3 class="footer__info-title">OpenPOWER Foundation</h3>
-					<div class="footer__addr">
-						Main Office<br>
-						548 Market Street, PMB 57274<br>
-						San Francisco, California<br>
-						94194-5401 US<br>
-						Phone/Fax: +1 415 723 9709
-					</div>
+<div class="container">
+	<div class="row">
+		<div class="col-md-4">
+			<div class="footer__info">
+				<h3 class="footer__info-title">OpenPOWER Foundation</h3>
+				<div class="footer__addr">
+					Main Office<br>
+					548 Market Street, PMB 57274<br>
+					San Francisco, California<br>
+					94194-5401 US<br>
+					Phone/Fax: +1 415 723 9709
 				</div>
 			</div>
-			<div class=col-md-4>
-				<div class="footer__info">
-					<h3 class="footer__info-title">Governance</h3>
-					<div class="footer__addr">
-						<a href="{{ "/privacypolicy/" | relURL }}">Privacy Policy</a><br>
-						<a href="">Certificate of Incorporation</a><br>
-						<a href="">Bylaws</a><br>
-						<a href="">IP Rights Policy</a>
-					</div>
+		</div>
+		<div class=col-md-4>
+			<div class="footer__info">
+				<h3 class="footer__info-title">Governance</h3>
+				<div class="footer__addr">
+					<a href="{{ "/privacypolicy/" | relURL }}">Privacy Policy</a><br>
+					<a href="">Certificate of Incorporation</a><br>
+					<a href="">Bylaws</a><br>
+					<a href="">IP Rights Policy</a>
 				</div>
 			</div>
-			<div class="col-md-4">
-				<p>Stay in touch, follow us:</p>
-				<div class="social__list pb-4 pb-lg-0">
-					<a target="_blank" class="social__item _tw" href="https://twitter.com/OpenPOWERorg"><span class="visually-hidden">Twitter</span></a>
-					<a target="_blank" class="social__item _fb" href="https://www.facebook.com/openpower"><span class="visually-hidden">Facebook</span></a>
-					<a target="_blank" class="social__item _in" href="https://www.linkedin.com/company/openpower-foundation/?viewAsMember=true"><span class="visually-hidden">LinkedIn</span></a>
-					<a target="_blank" class="social__item _yt" href="https://www.youtube.com/channel/UCNVcHm09eXVbvUzZkQs0_Sg"><span class="visually-hidden">Youtube</span></a>
-				</div>
+		</div>
+		<div class="col-md-4">
+			<p>Stay in touch, follow us:</p>
+			<div class="social__list pb-4 pb-lg-0">
+			{{ range .Site.Menus.social }}
+				<a target="_blank" class="social__item" href="{{ .URL }}">
+					<i class="{{ .Pre }}"></i>
+					<span class="visually-hidden">{{ .Name }}</span>
+				</a>
+			{{ end }}
 			</div>
 		</div>
 	</div>
+</div>
 </footer>
-
 <script src="{{ "lib/jquery/jquery.min.js" | absURL }}"></script>
 <script src="{{ "lib/jquery/jquery-migrate.min.js" | absURL }}"></script>
 <script src="{{ "lib/bootstrap/js/bootstrap.bundle.min.js" | absURL }}"></script>
@@ -47,9 +48,7 @@
 <script src="{{ "lib/magnific-popup/magnific-popup.min.js" | absURL }}"></script>
 <script src="{{ "lib/slick/slick.min.js" | absURL }}"></script>
 <script src="https://registration.openpower.foundation/widget/v1.en.js" type="text/javascript" async></script>
-
 <script src="{{ "js/preload.js" | absURL }}"></script>
-
 {{ $mainjavascript := resources.Get "js/main.js" }}
 {{ $mainjs := $mainjavascript | resources.Minify }}
 <script src="{{ $mainjs.RelPermalink }}"></script>
@@ -65,11 +64,9 @@
 {{ $changelogjavascript := resources.Get "js/changelog.js" }}
 {{ $changelogjs := $changelogjavascript | resources.Minify }}
 <script src="{{ $changelogjs.RelPermalink }}"></script>
-
 {{ if .Site.Params.analytics.piwik }}
 	{{ partial "_analytics/piwik.html" . }}
 {{ end }}
-
 <script>
 $(document).ready(function(){
 	$('.single-item').slick({
@@ -85,7 +82,6 @@ $(document).ready(function(){
 	});
 });
 </script>
-
 <script>
 if('serviceWorker' in navigator) {
 	navigator.serviceWorker
@@ -100,6 +96,5 @@ if('serviceWorker' in navigator) {
 		});
 }
 </script>
-
 </body>
 </html>