Make theme more compatible to zen base theme