diff --git a/system/admin/views/config-widget.html.php b/system/admin/views/config-widget.html.php
index bf7afeb..b9b5568 100644
--- a/system/admin/views/config-widget.html.php
+++ b/system/admin/views/config-widget.html.php
@@ -149,6 +149,21 @@
 	  <small><em>For google-site-verification meta</em></small>
     </div>
   </div>
+  <br>
+  <h4>Social Media</h4>
+  <hr>
+  <div class="form-group row">
+    <label for="google.reCaptcha.private" class="col-sm-2 col-form-label">Twitter account</label>
+    <div class="col-sm-10">
+      <input type="text" name="-config-social.twitter" class="form-control" id="social.twitter" value="<?php echo valueMaker(config('social.twitter'));?>" placeholder="https://twitter.com/gohtmly">
+    </div>
+  </div>
+  <div class="form-group row">
+    <label for="google.reCaptcha.private" class="col-sm-2 col-form-label">Facebook page</label>
+    <div class="col-sm-10">
+      <input type="text" name="-config-social.facebook" class="form-control" id="social.facebook" value="<?php echo valueMaker(config('social.facebook'));?>" placeholder="https://www.facebook.com/gohtmly">
+    </div>
+  </div>
   <div class="form-group row">
     <div class="col-sm-10">
       <button type="submit" class="btn btn-primary">Save config</button>
diff --git a/themes/blog/layout.html.php b/themes/blog/layout.html.php
index cd9f1ef..5e3a5c0 100644
--- a/themes/blog/layout.html.php
+++ b/themes/blog/layout.html.php
@@ -50,9 +50,8 @@
                 <?php } ?>
                 <p class="desc"><?php echo blog_tagline();?></p>   
                 <ul class="social list-inline">
-                    <li><a href="<?php echo config('social.twitter');?>"><i class="fa fa-twitter"></i></a></li>                   
-                    <li><a href="<?php echo config('social.facebook');?>"><i class="fa fa-facebook"></i></a></li>
-                    <li><a href="<?php echo config('social.tumblr');?>"><i class="fa fa-tumblr"></i></a></li>
+                    <?php if(!empty(config('social.twitter'))):?><li><a href="<?php echo config('social.twitter');?>"><i class="fa fa-twitter"></i></a></li><?php endif;?>                   
+                    <?php if(!empty(config('social.facebook'))):?><li><a href="<?php echo config('social.facebook');?>"><i class="fa fa-facebook"></i></a></li><?php endif;?> 
                     <li><a href="<?php echo site_url();?>feed/rss"><i class="fa fa-rss"></i></a></li>                                    
                 </ul> 
             </div><!--//branding-->
diff --git a/themes/twentyfifteen/layout.html.php b/themes/twentyfifteen/layout.html.php
index b4f917e..138caff 100644
--- a/themes/twentyfifteen/layout.html.php
+++ b/themes/twentyfifteen/layout.html.php
@@ -50,28 +50,29 @@
                     <aside class="widget widget_meta">
                         <h2 class="widget-title"><?php echo i18n("About");?></h2>
                         <p><?php echo blog_description() ?></p>
-                    </aside>                    
+                    </aside>          
+                    <?php if(!empty(config('social.twitter')) || !empty(config('social.facebook'))):?>					
                     <nav id="social-navigation" class="social-navigation" role="navigation">
                         <div class="menu-social-links-container">
                             <ul id="menu-social-links" class="menu">
+							    <?php if(!empty(config('social.twitter'))):?>
                                 <li class="menu-item">
                                     <a href="<?php echo config('social.twitter');?>">
                                     <span class="screen-reader-text">Twitter</span>
                                     </a>
                                 </li>
+								<?php endif;?>
+								<?php if(!empty(config('social.facebook'))):?>
                                 <li class="menu-item">
                                     <a href="<?php echo config('social.facebook');?>">
                                     <span class="screen-reader-text">Facebook</span>
                                     </a>
                                 </li>
-                                <li class="menu-item">
-                                    <a href="<?php echo config('social.google');?>">
-                                    <span class="screen-reader-text">Google</span>
-                                    </a>
-                                </li>
+								<?php endif;?>
                             </ul>
                         </div>
                     </nav>
+					<?php endif;?>
                     <aside class="widget search">
                         <form><input type="search" name="search" class="form-control" placeholder="Type to search"></form>
                     </aside>                            
diff --git a/themes/twentysixteen/layout.html.php b/themes/twentysixteen/layout.html.php
index aa46009..39aef17 100644
--- a/themes/twentysixteen/layout.html.php
+++ b/themes/twentysixteen/layout.html.php
@@ -130,15 +130,16 @@
                         <?php echo menu('primary-menu');?>
                     </div>
                 </nav><!-- .main-navigation -->
+				<?php if(!empty(config('social.twitter')) || !empty(config('social.facebook'))):?>
                 <nav aria-label="Footer Social Links Menu" role="navigation" class="social-navigation">
                     <div class="menu-social-links-container">
                     <ul class="social-links-menu" id="menu-social-links">
-                        <li><a href="<?php echo config('social.twitter');?>"><span class="screen-reader-text">Twitter</span></a></li>
-                        <li><a href="<?php echo config('social.facebook');?>"><span class="screen-reader-text">Facebook</span></a></li>
-                        <li><a href="<?php echo config('social.github');?>"><span class="screen-reader-text">GitHub</span></a></li>
+                        <?php if(!empty(config('social.twitter'))):?><li><a href="<?php echo config('social.twitter');?>"><span class="screen-reader-text">Twitter</span></a></li><?php endif;?>
+                        <?php if(!empty(config('social.facebook'))):?><li><a href="<?php echo config('social.facebook');?>"><span class="screen-reader-text">Facebook</span></a></li><?php endif;?>
                     </ul>
                     </div>                
                 </nav>
+				<?php endif;?>
                 <div class="site-info">
                     <span class="site-title"><a href="<?php echo site_url();?>" rel="home"><?php echo blog_title();?></a></span>
                     <span class="copyright"><?php echo copyright();?></span>