Implement the ability to change the tool-panel as user prederence.
Merged custom-toolbox2
Fix duplicate import from bad merge
Fix indentation from merge
Merge w/ central