Redesign for x-OSC v1.3