Reorganisation and minor updates to compos.xml.
ships.png update and Trinities added to the CSS.