I've made the CS a bit more simple. Hopefully that should relieve you all of that monolithic old CS template.