Refactor #9623 - Refactor MODxCarbon theme 95

http://tracker.modx.com/issues/9623