Change some more theme statements