Simplify selector toolboxes, back into just one