Detect system type and set formatting accordingly.
Merge branch 'system-detection'