#86-najtmare

This pulls in and refactors the work done by @Najtmare on arworks and galleries.