various theme bugfixing