[9] Change to universal app