Fixes #62 - migrated some of the generic changes made for Deploy360 back into the main theme