Added the on-screen text code
Merge origin/master
Changed the types dictionary to be a passed in parameter