Refactoring Traps, now using Spritesheets
Refactored themes.js
Merge remote-tracking branch 'origin/master'