Some theme fixes, especially for Android 2.x.