HJ/BW Add font functionality