Add support for Vintageous, clean up code