Add new settings and reorganize them under categories