Cleanup whitespace
Fix term colours for screen & Putty