fixed conflicting shortcuts and made beat marks more gray