Minor changes to make it work with the BaseLight Theme.