Some other ideas about handling the theming

Change-Id: Iec8c5f49827ee2b18ddf97d37077b2f0798a0685