Added Custom Color Options and some JS changes