UI theme fixes