Fix windows code
Adjust for new styling behavior