Added ColorPicker. Rearranged controls in folders.