Incorporated swatches

+ Fixed bug for scenario whereby there are no file locations