Brought stylus files back into line with current master.