Merged addition of Pentadactyl and Vimperator