Added the new logo, added shortNames support