Major fix and refactoring.
View the goddamn diff XD
you have to manually delete xmls and pictures for the changes to work.