various UI theme bugfixing