minor bug fixes upstream and new theme!