Improved CTRL-P settings