move images to base64
change st- to fs-
fix merge conflict