== Swatch template == 

 Why exactly did you change the swatch template a couple of months ago?  It worked just fine before.  Is there a specific page in which you wanted it to do something different?