Fixed #783

Also removed separate settings for palette