Added notebook theme support