Fixed an error in branch merge, add missing doxygen theme files.