Bug 8628 - Use Theme (swatch) instead of just Swatch P40854855