Styling exchange
Add type to transport
merge with dev
merge with my files