theme updates, bug fixes