EDIT new drawables qualifiers
EDIT minor changes