Replaced embedded Class variables with Font and Bitmap objects