thor changes, CMake adjustments
added theme