Fixes to the base theme