Moving command-t hacks to unite sources