Updated Settings Array And Class Names