Remove dependency with helpers and modern theme