lots of theme and bug fixes