Fix theme FC

Change-Id: If896661b736568220e8e791c05bd1dc251b3976a