Fixed numerous issues with the themes