This partially reverts and adapts commit cde81e52.
This is mostly related to Palette and Options
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>