[Bug 3931] Add more Components categories