Update: I forgot Captain Cox made a Lieutenant JG shirt for RFB, so it's all taken care of. The only thing I need to figure out is the CPO shirt. Did they wear any sort of collar insignia?
Otherwise, I currently have the officers wearing their appropriate rank insignia, and the CPO no longer wears the officer's cap.
