Cleaning up theme.js