fixing race condition, adding missing files, themes, etc