2nd theme pass