Theme fixes

various small fixes