Break up standard and custom variables in configuration

Will require a clean of the database, again :(