Variation swatches – Need more options

In the fitted hat section, we use 2 attributes. Color and Size. If I click on a color, the product image wont change unless I also click on a size. Can we have an option where if I click on a color only, it can change the product image to the color chosen without having to click on a size?

Out of stock product are only x’d out on product pages and not category pages. I would need them x’d out on product category pages as well

Clicking on a color variant in category pages changes the hat color, but when I scroll away from the product, the image changes back to the original product image. I do not want the image to go back to the original product image.