Fix  base theme compatible with J3.2