ContextRework: LIGHT MODERNIZATION / SIMPLIFICATION / UNIFICATION