I saw to many issues on the previous pic I just couldn't stand it. I had to fix them up.
It was worth it, even added in a few new elements.

Recreated a SFW variant too.