Some fixes to the base theme to work on Pyro 2.2