Fix Theme Style option FC

Change-Id: Ie2fd039f0e73ee4058a5ca10e439c84a60873ce4