slight cleanup and better themes