Fix two minor bugs

* Reset the class options provided by xkeyval after parsing the original options. This prevents
  a bug where the color option is interpreted by siunitx, which proceeds to complain about the
  non-existent color by the name `<colortheme>`.
* Correct spaces after the figure and table names.