Moved some config values around

Some of these defaults should really be defined by the style.