"Try to fix build, fix display_settings.xml

I am adding this feature that has some conflicts, actually trying to fix them ;)