Revert "OnSet and art assets"

This reverts commit 53fc1478317ce02525226da857718978b2bae4dc.
Revert "Revert "OnSet and art assets""

This reverts commit 300a6dbe49efae7ec87c48ef9ab1bcb4e77ef274.