Refactor with correct theme name