workin on tightening up the theme (based on WP-2012)