Fix switching between version
Improve resource style