fix theme issue and complete toast'