Changed to API 21 and added a new color theme