Reworked enchant types some more