swatch fixed. moved some dependencies into custom element.