Updated rebild_general_settings feature