Improved design configuration

@marcbachmann Should we use the real thing? What do you think?