Improve white-button coloration
Add todo for combinos