Added design selector and OS detection