Made all of Sweyn's naming changes...not sure how the svg stuff is going to work in your template. Call me to discuss if you'd like