apk with highlight fixes

apk with highlight fixes

Signed-off-by: Eric Friesen <efriesen@gmail.com>