Added new changes and updates from _s to clean up theme