More theme updates