Themes assets cleanup again