refactoring to get theme ready for submission