Refactoring themes.js and spritesheets