Merge in Ilias' changes, make an external stylesheet