generale changes, spoiler, multitheme support