#217: Finished BS3 conversion excluding form alignment