Merge in crystals from 2.1...

...and balance the "sticks" of other materials