improve design conditionals
Merge branch 'master' of https://github.com/nystromj/apteetude