Minor refactoring
More dependencies, update your /lib!
Updated drawing packages