* Disable non-working stuff (themes) * Re-enable now-working stuff Change-Id: I929fabb2d9068616c48b5f16672cbb66f2600490