Working on custom Logo support. WORK IN PROGRESS