Applied changes to subprojects

Doesn’t work :(
Re-write by Sticktron