Updating SVP Theme and fixes