Re-enable dependencies and alphabetize