I don't think we have to do the ifdef thing right now, there are plans for a big button re-write anyway (in bf) I would qualify these changes as "minor" and the button-regrouping etc as "mayor" Roel