General refractoring

Created enum, updated names, removed resharper warnings reverted to
foreach on color change