Remove highlighting on accept-line
Improved widget name convention consistency