added new structure to allow for multiple themes in the future.