Refactor #9623 - Refactor MODxCarbon theme
http://tracker.modx.com/issues/9623