FWB: Fixes for the themes commit

Change-Id: Idfd5749b1e3605a1a75d4d04ff69b1ab7d74f1e3
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>