Rebranding, code and theme cleanup