- Added color in the server side (do not know if the server should know the color, or if it should be in the server side)
- Removed un-used code.