Tweak Horz menu popup window settings
Tweak custom popup windows add type title
Merge remote-tracking branch 'upstream/master'