Rebuild theme and refactor content