Theme: improve titling (take 2)