Merge pull request #413 from avuton/master

Big resource cleanup, bugfixes, accessibility and performance improvements.