Added custom markers, fixed color conditions