add command-t, move cpp-highlight