Improved word list, split into categories