support for themes, 2 extra languages, cleanups