AV isn't currently in the plans, but as far as the latter, I do intend on making a toggle for more explicit versions of the portraits that will have things like that.
