More theme tinkering