Fixed bad reference
Attempted fix of HSV triangle pick
Moved stuff to layers (primitive)