Some fixes to the bease theme