Fix c++11 headers
Theme tweak