[UPDATE] Separate theme concern