Changed comment colour and restored swap files