Add more custom variables and formating divs.
Update for heroku compatability