Added the Hybrid map type and cleaned up some constraints, added Grace's icons