fixed settings issue
Font modifications
Testing Stuff
Font weight change
conflit resolution