simplified theme options, concat body and wrapper.coffee, cleanup