Cleaned up settings
Moved many optional apps to required apps