Update theme name throughout and fix portions of the header