More custom items.
Merge pull request #3218 from Zuhayr/feature

More custom items.