did some fix on new theme