Cleanup and update to API Level 11 for Holo theme