That was a challenging and fun game :O The only thing that bugs me is when touching a diamond our character do not swap instantly and you have to move to get it working :/
Other than that maybe tweaking some levels and adding diffrent hazards can make the game more interesting to play.
Overall it was fun nice job :D