added theme and change some settings