Some refactorings
ColorDrawable done