New drawables added, minor changes merged