more theme fixing