Start of fixing the theme functions. Updated the social plugin. Still needs testing.