Added more utilities for new theme