Refactor WRM geometry style settings