Small fixes and clean up, changed do default theme