changed colors
Merge remote-tracking branch 'origin/GUIclient-sockets'