I've simplified the calls, and can move the css into the less files once the js and other features are finalized.