fix unnecessary class trimming + Mac Command key shourtcuts support