OS 5 and 6 UPS Support

- Fixed issue where OS 5 UPS was never displayed
- Added UPS support for OS 6

Fixes #120