Update Vanilla 2.1 with nitrogen theme file changes