[usertmpfiles] Small refactor
[tmux] Add move-window -r to version block