Removing TypePx dependence and adding in some custom type extensions instead
Updating libraries to latest version