removed old drawables and tidied up names of existing drawables