An upgrade of fest-swing to 2.x