Add new OS's and rearrange