Fixed menu highlight
Fixed almost all deprecations