Significant theme refactoring