Changed colors and took size into consideration