Just two. Personality quirks and lifestyle choices aren't genders in of themselves. Likewise Gender Expression is not a term interchangeable with Gender itself.
You can be a Boy (Gender) who was born a girl (Sex) who doesn't quite identify with macho men or girly boys but that's not a gender unto itself.
My wife likes her hair short, likes more masculine clothes, and likes action movies but that doesn't make her some sort of "non-binary", "demi-queer" or whatever.
I don't mind people having silly labels but I don't have to drink the same kool aid. It's just the whole Goth, Emo, Punk thing all over again but now we're calling them "Genders".