trying to setup palette
some changes
resloved conflicts