+Color vars
+Map pin fix