More modifications to completition
Merge from work
Add underline for urxvt