YH-91: Modified theme to include common elements