Added images replace support by themes