Fix submodule mess - attempt 1
Add Align plugin again..