Added missing effects.
Added missing item images.
Merge origin/master