Replace keys; Add more screenshots