Cleaning up the clusterfuck of theme engine source.

Change-Id: I9d5f11ccefae99e20270ad4036d6daa81978be2a