fix strings and make themed

Change-Id: I70d9857d13f98eebc9ef127d1d9aa10ef2ab2001