Cleaned up and updated .sketch sources to version 3