Update theme: shorten branch, PYENV_VERSION, cleanup