styling changes
commit annoying windows mode settings
merge changes