almost converted to new theme