Fixes to base theme