Minor fixes

- Paving the way for a color picker of sorts