Conflict resolved (?) :P
- reverted gender_None
- reverted compatibility with fix of fallback to CSS.

Signed-off-by: Antes <antes@simplemachines.org>