Make a few things more customizable