Theme fixes

some small fixes..