Improve gallery
Rename image files according to scheme