Badwolf theme and some improvements