colour buttons fix + reload themes

Users can now click cancel when selected a colour and not have it
seemingly disappear, and reload the themes from the current themes
folder instead of re-selecting it
Merge pull request #1101 from SongSing/master

colour buttons fix + reload themes