more theme changes
cleanup