update theme & remove alert