Added catetories for many types, based on input from Raymon after EC/TC meeting