Various theme updates + bug fixes