Fixing includes

Applying preferences to includes rather than just tab display, which
should help massively with loading times