Actualize my templates one more time
Reloader added
Merge some crappy conflicts