Added further code to support the change of location for swatch libraries.