Clean up the general display settings

PS2: Rebase + Rearrange + Vooo doooo
PS3: Builds now.  Change of Voodoo
PS4: Stashing changes while testings
PS5: Fixy derp derp≈
PS6: So far away...
PS7: I'm not the one who's so far away...
PS8: VOOOODOOOOO   VOOOOODOOOOOO
PS9: Fixed all the whitespaces and tabs

Change-Id: I5578ed801d12eff2f462642673fd0165a0aa8cf2