Pulled color and matrix into their own files
Improvements to port connector