Added updates from Dj Skarj's version
Added new resources