Using a strict segregation for application based shortcuts just didn't

work for me.  Moved back to $mod+Return (for example) for terminals etc.
Custom shortcuts (e.g. $mod_next+i etc.) remains though.
Cleaned up some unused keyboard shortcuts.