Added the new item type stuff

It's all more or less added, but I still need to go through everything that uses the 'old' itemtype and redo those to use the new type/subtype.

They all still point to the old item type (which is the same, except I removed 'None'). So nothing should have broken.