Changed themes to support API 8+