ThemeEngine: Unsolved conflicts while rebasing gerrit commit

Uncaught cats, can happen at 5 am.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>