Fix reply moving

Forgot to include template, also had a bug with `rebuildThemes`