jf: move gps props down to variants