Fix non intrusive incall ui and revert custom theme