Added markup-font
Fixed shorctus selection bugs