Pulled back updates from original theme and added my own tweaks.