YH-91: Initial theme building and separated more roles